I missed the fact that the Cmake stuff was installing the man page to
${PREFIX}/share/man/ instead of ${PREFIX}/man. Correct that, and add some code to the Makefile and the pkg-plist to remove the spurious file. Bump PORTREVISION so that users who've already installed this version can pick up the file removal fix sooner rather than later.
This commit is contained in:
parent
cd7b857da4
commit
9250841fb6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=298983
2 changed files with 11 additions and 0 deletions
|
@ -6,6 +6,7 @@
|
|||
|
||||
PORTNAME= slim
|
||||
PORTVERSION= 1.3.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= http://slim.berlios.de/releases/
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.release.asc
|
||||
|
@ -41,10 +42,17 @@ post-patch:
|
|||
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${PORTNAME}.conf
|
||||
@${REINPLACE_CMD} -e 's|"/etc"|"${PREFIX}/etc"|' \
|
||||
-e 's|slim.conf|slim.conf.sample|' \
|
||||
-e 's|set(MANDIR "$${CMAKE_INSTALL_PREFIX}/share/man")|set(MANDIR "${PREFIX}/man")|' \
|
||||
${WRKSRC}/CMakeLists.txt
|
||||
@${MV} ${WRKSRC}/slim.conf ${WRKSRC}/slim.conf.sample
|
||||
@${REINPLACE_CMD} -e 's|std::snprintf|snprintf|' ${WRKSRC}/Ck.cpp
|
||||
|
||||
# Fix a previous bad install
|
||||
pre-install:
|
||||
@/bin/rm -f ${LOCALBASE}/share/man/man1/slim.1
|
||||
@/bin/rmdir ${LOCALBASE}/share/man/man1 2>/dev/null
|
||||
@/bin/rmdir ${LOCALBASE}/share/man 2>/dev/null
|
||||
|
||||
post-install:
|
||||
@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
|
||||
@if [ ! -f ${PREFIX}/etc/slim.conf ]; then \
|
||||
|
|
|
@ -8,3 +8,6 @@ bin/slim
|
|||
@unexec if cmp -s %D/etc/slim.conf.sample %D/etc/slim.conf; then rm -f %D/etc/slim.conf; fi
|
||||
etc/slim.conf.sample
|
||||
@exec if [ ! -f %D/etc/slim.conf ] ; then cp -p %D/%F %B/slim.conf; fi
|
||||
@exec /bin/rm -f %D/share/man/man1/slim.1
|
||||
@exec rmdir "%D/share/man/man1" 2>/dev/null || true
|
||||
@exec rmdir "%D/share/man" 2>/dev/null || true
|
||||
|
|
Loading…
Reference in a new issue