Improve installation procedure and pkg-* documentation.

PR:		24561
Submitted by:	Cyrille Lefevre <clefevre@citeweb.net> - maintainer

4 files changed, 56 insertions, 11 deletions

diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile
index 97913ed2be1c..5735be0ab166 100644
--- a/misc/findutils/Makefile
+++ b/misc/findutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	findutils
 PORTVERSION=	4.1
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= findutils
@@ -15,7 +16,11 @@ MAINTAINER=	clefevre@citeweb.net
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--program-prefix=g
+#
+# Global variables
+#
+
+CONFIGURE_ARGS=	--program-prefix=g # --localstatedir=${LOCALSTATEDIR}
 MAKE_ARGS=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 USE_GMAKE=	yes
@@ -23,12 +28,52 @@ USE_GMAKE=	yes
 MAN1=		gfind.1 gxargs.1 glocate.1 gupdatedb.1
 MAN5=		glocatedb.5
 
-post-install:
-	install-info ${PREFIX}/info/find.info ${PREFIX}/info/dir
-	${RM} -f ${PREFIX}/man/cat1/gfind.1
-	${RM} -f ${PREFIX}/man/cat1/gxargs.1
-	${RM} -f ${PREFIX}/man/cat1/glocate.1
-	${RM} -f ${PREFIX}/man/cat1/gupdatedb.1
-	${RM} -f ${PREFIX}/man/cat5/glocatedb.5
+#
+# Local variables
+#
+
+LOCALSTATEDIR?=	/var/db
+
+INSTALL_INFO?=	install-info
+
+#
+# Post-extract
+#
+
+post-extract:
+	@${RM} -f ${WRKSRC}/doc/${PORTNAME:S/utils//}.info*
+
+#
+# Post-patch
+#
+
+post-patch:
+	@${PERL} -pi.fbsd -e 's|makeinfo|makeinfo --no-split|g' \
+		${WRKSRC}/doc/Makefile.in
+
+#
+# Post-configure
+#
+
+# --localstatedir= isn't handled right now, so, do it manually.
+post-configure:
+	@${PERL} -pi.fbsd -e 's|\$$\(prefix\)/var|${LOCALSTATEDIR}|g' \
+		${WRKSRC}/Makefile ${WRKSRC}/locate/Makefile
+
+#
+# Post-install
+#
+
+post-install: install-info remove-catman
+
+install-info:
+	@${INSTALL_INFO} ${PREFIX}/info/${PORTNAME:S/utils//}.info ${PREFIX}/info/dir
+
+remove-catman:
+.for mansect in 1 5
+.for man in ${MAN${mansect}}
+	@${RM} -f ${MAN1PREFIX}/man/cat${mansect}/${man}
+.endfor
+.endfor
 
 .include <bsd.port.mk>
diff --git a/misc/findutils/pkg-comment b/misc/findutils/pkg-comment
index b93e94a32662..a98c6256b38e 100644
--- a/misc/findutils/pkg-comment
+++ b/misc/findutils/pkg-comment
@@ -1 +1 @@
-The FSF's version of find(1), xargs(1), and locate(1)
+The GNU find utilities
diff --git a/misc/findutils/pkg-descr b/misc/findutils/pkg-descr
index d259b39f5b7f..0fdb8afbfbd8 100644
--- a/misc/findutils/pkg-descr
+++ b/misc/findutils/pkg-descr
@@ -7,3 +7,5 @@ versions have added functionality that is sometimes useful.
 Note that this port will install these utilities with a `g' prefix,
 eg., glocate, gfind, gxargs, but the texinfo documentation will refer to
 these utilities without the `g' prefix.
+
+WWW: http://www.gnu.org/software/findutils/findutils.html
diff --git a/misc/findutils/pkg-plist b/misc/findutils/pkg-plist
index 242a8faf425d..4943ae47f8a4 100644
--- a/misc/findutils/pkg-plist
+++ b/misc/findutils/pkg-plist
@@ -7,6 +7,4 @@ libexec/gcode
 libexec/gbigram
 @unexec install-info --delete %D/info/find.info %D/info/dir
 info/find.info
-info/find.info-1
-info/find.info-2
 @exec install-info %D/info/find.info %D/info/dir