[pkgsrc/trunk]: pkgsrc/comms/fidogate Honor PKGINFODIR and clean up the insta...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df94a9b17eb6
branches:  trunk
changeset: 509943:df94a9b17eb6
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 20 03:59:39 2006 +0000

description:
Honor PKGINFODIR and clean up the install process to avoid an unnecessary
pre-install target.

diffstat:

 comms/fidogate/Makefile         |  30 +++++++++++++-----------------
 comms/fidogate/PLIST            |   3 ++-
 comms/fidogate/distinfo         |   4 ++--
 comms/fidogate/patches/patch-aa |   4 ++--
 4 files changed, 19 insertions(+), 22 deletions(-)

diffs (108 lines):

diff -r 482dc761b3bd -r df94a9b17eb6 comms/fidogate/Makefile
--- a/comms/fidogate/Makefile   Mon Mar 20 03:53:27 2006 +0000
+++ b/comms/fidogate/Makefile   Mon Mar 20 03:59:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/03/05 16:27:23 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2006/03/20 03:59:39 jlam Exp $
 #
 
 DISTNAME=      fidogate-4.4.10
@@ -14,11 +14,10 @@
 MAKE_ENV+=             DEBUG="${CFLAGS} -Werror"
 BUILDLINK_SETENV.CC=   CC="cc ${_STRIPFLAG_CC}"
 
-INFO_FILES=    fidogate.info
-
 EGDIR=         ${PREFIX}/share/examples/fidogate
 CONF_FILES=    ${EGDIR}/fidogate.conf ${PKG_SYSCONFDIR}/fidogate/fidogate.conf
 RCD_SCRIPTS=   fidogate
+INFO_FILES=    # PLIST
 
 PKG_USERS=     news:news::Network\ News:/var/spool/news:${NOLOGIN}
 PKG_GROUPS=    news
@@ -27,9 +26,16 @@
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     config.make
-SUBST_SED.paths=       -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths=     post-patch
+SUBST_SED.paths=       -e "s,@PREFIX@,"${PREFIX:Q}",g"
+SUBST_SED.paths+=      -e "s,@PKG_SYSCONFDIR@,"${PKG_SYSCONFDIR:Q}",g"
+SUBST_SED.paths+=      -e "s,@PKGINFODIR@,"${PKGINFODIR:Q}",g"
+SUBST_STAGE.paths=     pre-build
+
+OWN_DIRS=              ${PKG_SYSCONFDIR}/fidogate
+INSTALLATION_DIRS=     ${EGDIR}                lib/fidogate            \
+                       lib/fidogate/bin        share/doc/fidogate      \
+                       share/fidogate          share/fidogate/sendmail \
+                       share/fidogate/sendmail/mailer
 
 post-extract:
        @${CP} ${WRKSRC}/examples/orodruin/fidogate.conf \
@@ -37,21 +43,11 @@
 
 pre-build:
        ${RM} -f ${WRKSRC}/doc/fidogate.info*
-       cd ${WRKSRC}/doc && ${MAKEINFO} --no-split fidogate.texi && \
+       cd ${WRKSRC}/doc && makeinfo fidogate.texi && \
                ${TOUCH} fidogate.txt html/fidogate_toc.html
        ${PERL5} ${WRKSRC}/subst.pl -t${WRKSRC} ${WRKSRC}/fidogate.conf.dist \
                >${WRKSRC}/fidogate.conf
 
-pre-install:
-       ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/fidogate
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/fidogate
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/fidogate/bin
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fidogate
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/fidogate
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/fidogate/sendmail
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/fidogate/sendmail/mailer
-
 post-install:
        cd ${WRKSRC}/examples && for f in `${FIND} [m-p]* -type d -print`; do \
                ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fidogate/$$f; done
diff -r 482dc761b3bd -r df94a9b17eb6 comms/fidogate/PLIST
--- a/comms/fidogate/PLIST      Mon Mar 20 03:53:27 2006 +0000
+++ b/comms/fidogate/PLIST      Mon Mar 20 03:59:39 2006 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.9 2005/08/17 11:43:27 tv Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/20 03:59:39 jlam Exp $
+info/fidogate.info
 lib/fidogate/areafix.help
 lib/fidogate/bin/areasbbssync
 lib/fidogate/bin/ftnafutil
diff -r 482dc761b3bd -r df94a9b17eb6 comms/fidogate/distinfo
--- a/comms/fidogate/distinfo   Mon Mar 20 03:53:27 2006 +0000
+++ b/comms/fidogate/distinfo   Mon Mar 20 03:59:39 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2005/12/29 23:31:35 joerg Exp $
+$NetBSD: distinfo,v 1.14 2006/03/20 03:59:39 jlam Exp $
 
 SHA1 (fidogate-4.4.10.tar.gz) = 531305ac82963d5bd6398d2e8e350676bbc9c5eb
 RMD160 (fidogate-4.4.10.tar.gz) = 09b8dfa7304089ff27c7c39c1b6004aef00edadf
 Size (fidogate-4.4.10.tar.gz) = 1191524 bytes
-SHA1 (patch-aa) = a12ffe978a32b342a48927b2887b4c5340816c5c
+SHA1 (patch-aa) = a8db429484f09d0ed723886ff44e12bc221ec366
 SHA1 (patch-ab) = 27457fff799208f3daf72eabb6a7b0b056faf945
 SHA1 (patch-ac) = 220f4d95a4ef28fba3ac603957a2f084df5a95e4
 SHA1 (patch-ad) = bc08f722e53b23181d797e1f504023cf4b1ae5fa
diff -r 482dc761b3bd -r df94a9b17eb6 comms/fidogate/patches/patch-aa
--- a/comms/fidogate/patches/patch-aa   Mon Mar 20 03:53:27 2006 +0000
+++ b/comms/fidogate/patches/patch-aa   Mon Mar 20 03:59:39 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2004/08/23 15:18:02 tv Exp $
+$NetBSD: patch-aa,v 1.7 2006/03/20 03:59:40 jlam Exp $
 
 --- config.make.orig   2003-04-15 14:45:20.000000000 -0400
 +++ config.make
@@ -67,7 +67,7 @@
 -INFODIR                       = /usr/info
 -HTMLDIR                       = /html/fidogate
 -HTMLLOGDIR            = /html/log
-+INFODIR                       = @PREFIX@/info
++INFODIR                       = @PREFIX@/@PKGINFODIR@
 +HTMLDIR                       = @PREFIX@/share/doc/fidogate
 +HTMLLOGDIR            = @PREFIX@/share/fidogate