aboutsummaryrefslogtreecommitdiffstats
path: root/x11/slim
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2012-06-11 06:02:00 +0800
committerdougb <dougb@FreeBSD.org>2012-06-11 06:02:00 +0800
commitf3dc97184fdeaeb82705e08d31cc454e6d5d5b0f (patch)
tree517d028dc748c888d1037c04642a0f861bf3f969 /x11/slim
parent7c1c81e967791c1d05b63615a5817901fdd0c40a (diff)
downloadfreebsd-ports-gnome-f3dc97184fdeaeb82705e08d31cc454e6d5d5b0f.tar.gz
freebsd-ports-gnome-f3dc97184fdeaeb82705e08d31cc454e6d5d5b0f.tar.zst
freebsd-ports-gnome-f3dc97184fdeaeb82705e08d31cc454e6d5d5b0f.zip
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.
Diffstat (limited to 'x11/slim')
-rw-r--r--x11/slim/Makefile8
-rw-r--r--x11/slim/pkg-plist3
2 files changed, 11 insertions, 0 deletions
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index 4b4c1b112bad..818c6259a51a 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -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 \
diff --git a/x11/slim/pkg-plist b/x11/slim/pkg-plist
index 759ecbbb4f07..279827a78b62 100644
--- a/x11/slim/pkg-plist
+++ b/x11/slim/pkg-plist
@@ -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