From 2829e658f2ba62cb77f3f151f468ec8de1549bd5 Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 7 Jan 2007 09:13:46 +0000 Subject: Mechanically replaced man/* with ${PKGMANDIR}/* in the definition of INSTALLATION_DIRS, as well as all occurrences of ${PREFIX}/man with ${PREFIX}/${PKGMANDIR}. Fixes PR 35265, although I did not use the patch provided therein. --- mail/autorespond/Makefile | 6 +++--- mail/bbmail/Makefile | 6 +++--- mail/bulk_mailer/Makefile | 6 +++--- mail/cucipop/Makefile | 8 ++++---- mail/dbmail/Makefile | 4 ++-- mail/deliver/Makefile | 6 +++--- mail/demime/Makefile | 6 +++--- mail/dk-milter/Makefile | 4 ++-- mail/dkim-milter/Makefile | 4 ++-- mail/exim3/Makefile | 4 ++-- mail/exmh/Makefile | 4 ++-- mail/ezmlm/Makefile | 4 ++-- mail/fetchmailconf/Makefile | 6 +++--- mail/gotmail/Makefile | 4 ++-- mail/imap-uw-utils/Makefile | 6 +++--- mail/ja-squirrelmail/Makefile | 4 ++-- mail/mailscanner/Makefile | 8 ++++---- mail/mailsync/Makefile | 6 +++--- mail/mailwrapper/Makefile | 4 ++-- mail/mess822/Makefile | 4 ++-- mail/milter-regex/Makefile | 6 +++--- mail/mini_sendmail/Makefile.common | 4 ++-- mail/mutt/Makefile | 4 ++-- mail/nail/Makefile | 6 +++--- mail/offlineimap/Makefile | 6 +++--- mail/pfqueue/Makefile | 6 +++--- mail/pine/Makefile | 10 +++++----- mail/popa3d/Makefile | 6 +++--- mail/poppassd/Makefile | 6 +++--- mail/poppy/Makefile | 6 +++--- mail/procmail/Makefile | 8 ++++---- mail/qmail-qfilter/Makefile | 4 ++-- mail/rss2email/Makefile | 6 +++--- mail/sigrot/Makefile | 6 +++--- mail/sma/Makefile | 4 ++-- mail/smtpfeed/Makefile | 6 +++--- 36 files changed, 99 insertions(+), 99 deletions(-) (limited to 'mail') diff --git a/mail/autorespond/Makefile b/mail/autorespond/Makefile index 9cc2a1aa96a..1a1b09062a9 100644 --- a/mail/autorespond/Makefile +++ b/mail/autorespond/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/16 06:58:02 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= autorespond-2.0.5 @@ -17,11 +17,11 @@ SUBST_STAGE.qmaildir= do-configure SUBST_FILES.qmaildir= autorespond.c SUBST_SED.qmaildir= -e 's|/var/qmail|${QMAILDIR}|g' -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/autorespond ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/autorespond.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/autorespond.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/autorespond ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/autorespond ${INSTALL_DATA} ${WRKSRC}/qmail-auto ${PREFIX}/share/doc/autorespond diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile index 492fa8749b9..5c06864eecc 100644 --- a/mail/bbmail/Makefile +++ b/mail/bbmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/07/22 04:46:16 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= bbmail-0.8.3 @@ -13,13 +13,13 @@ COMMENT= Mailbox monitor (not only) for the blackbox windowmanager GNU_CONFIGURE= YES USE_LANGUAGES= c c++ -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/x11.buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bbmail ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/bbmail.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/bbmail.1 ${PREFIX}/${PKGMANDIR}/man1/ ${INSTALL_DATA_DIR} ${PREFIX}/share/bbtools/ ${INSTALL_DATA} ${WRKSRC}/data/bbmail.bb ${PREFIX}/share/bbtools/ diff --git a/mail/bulk_mailer/Makefile b/mail/bulk_mailer/Makefile index 550f19df1f3..67d04a269e4 100644 --- a/mail/bulk_mailer/Makefile +++ b/mail/bulk_mailer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/11/07 21:17:52 tv Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= bulk_mailer-1.13 @@ -13,11 +13,11 @@ BUILD_TARGET= bulk_mailer CPPFLAGS.SunOS+= -DPIPECOMMAND=\"/usr/sbin/sendmail -bs %s\" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${PREFIX}/bin/bulk_mailer - ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/man/man1/bulk_mailer.1 + ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/${PKGMANDIR}/man1/bulk_mailer.1 .include "../../devel/sysexits/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile index 897263caa88..6afdef4de76 100644 --- a/mail/cucipop/Makefile +++ b/mail/cucipop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/03/04 21:29:58 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= cucipop-1.31 @@ -41,7 +41,7 @@ MAKE_ENV+= CFLAGS_INET6=-DINET6 LDFLAGS.SunOS+= -lnsl -lsocket -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin pre-configure: @(cd ${WRKSRC}; \ for f in config.h cucipop.8 makevpopdb.8; do \ @@ -52,7 +52,7 @@ pre-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cucipop ${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKSRC}/makevpopdb ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/cucipop.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/makevpopdb.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/cucipop.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKSRC}/makevpopdb.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index d4f5067d658..2ed4d6da4ef 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/22 09:22:10 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= dbmail-2.0.7 @@ -30,7 +30,7 @@ SUBST_FILES.sysconf+= dbmail.h SUBST_SED.sysconf= -e 's|/etc/dbmail\.conf|${PKG_SYSCONFDIR}/dbmail.conf|g' SUBST_MESSAGE.sysconf= Fixing sysconf paths. -INSTALLATION_DIRS= lib man man/man1 man/man8 sbin share/examples/dbmail +INSTALLATION_DIRS= lib man ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin share/examples/dbmail post-install: ${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${EGDIR} diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile index 45eb0cabf8d..e35dd6bec57 100644 --- a/mail/deliver/Makefile +++ b/mail/deliver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/10/28 15:17:17 schwarz Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:57 rillig Exp $ DISTNAME= deliver-2.1.14 PKGREVISION= 1 @@ -39,8 +39,8 @@ post-install: for FILE in deliver.1 header.1; do \ CATFILE=`${BASENAME} $${FILE} .1`.0; \ nroff -man $${FILE} > $${CATFILE}; \ - ${INSTALL_MAN} $${FILE} ${PREFIX}/man/man1; \ - ${INSTALL_MAN} $${CATFILE} ${PREFIX}/man/cat1; \ + ${INSTALL_MAN} $${FILE} ${PREFIX}/${PKGMANDIR}/man1; \ + ${INSTALL_MAN} $${CATFILE} ${PREFIX}/${PKGMANDIR}/cat1; \ done ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/deliver \ ${PREFIX}/share/examples/deliver diff --git a/mail/demime/Makefile b/mail/demime/Makefile index fde199279a6..25e7561ec38 100644 --- a/mail/demime/Makefile +++ b/mail/demime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:59 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= demime-1.1d @@ -24,7 +24,7 @@ USE_TOOLS+= perl:run pod2man EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/demime_junkmail.cf ${PKG_SYSCONFDIR}/demime_junkmail.cf -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: @${MKDIR} ${WRKSRC} @@ -39,6 +39,6 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/demime ${PREFIX}/bin/demime ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/demime_junkmail.cf ${EGDIR} - ${INSTALL_MAN} ${WRKSRC}/demime.1 ${PREFIX}/man/man1/demime.1 + ${INSTALL_MAN} ${WRKSRC}/demime.1 ${PREFIX}/${PKGMANDIR}/man1/demime.1 .include "../../mk/bsd.pkg.mk" diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index 6e524bb46b9..e6bb07d6748 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/10/04 21:47:16 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:57 rillig Exp $ DISTNAME= dk-milter-0.3.0 PKGREVISION= 1 @@ -40,7 +40,7 @@ post-build: do-install: cd ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ -` && \ ${INSTALL_PROGRAM} dk-filter/dk-filter ${PREFIX}/sbin/dk-milter - ${INSTALL_MAN} ${WRKSRC}/dk-filter/dk-milter.8 ${PREFIX}/man/man8/ + ${INSTALL_MAN} ${WRKSRC}/dk-filter/dk-milter.8 ${PREFIX}/${PKGMANDIR}/man8/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dk-milter ${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dk-milter ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dk-milter diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile index d51fbe5f1ae..22674527792 100644 --- a/mail/dkim-milter/Makefile +++ b/mail/dkim-milter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/04/22 09:22:10 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:57 rillig Exp $ DISTNAME= dkim-milter-0.1.1 CATEGORIES= mail @@ -39,7 +39,7 @@ post-build: do-install: cd ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ -` && \ ${INSTALL_PROGRAM} dkim-filter/dkim-filter ${PREFIX}/sbin/dkim-milter - ${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-milter.8 ${PREFIX}/man/man8/ + ${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-milter.8 ${PREFIX}/${PKGMANDIR}/man8/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dkim-milter ${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dkim-milter ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dkim-milter diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index 23719ebd51d..5c4e070e485 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/04/23 00:12:38 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2007/01/07 09:13:57 rillig Exp $ DISTNAME= exim-3.36 PKGREVISION= 7 @@ -103,7 +103,7 @@ pre-install: post-install: ${INSTALL_SCRIPT} ${WRKDIR}/exim_newaliases ${PREFIX}/sbin/exim_newaliases ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR} - ${CP} ${FILESDIR}/exim.8 ${PREFIX}/man/man8/exim.8 + ${CP} ${FILESDIR}/exim.8 ${PREFIX}/${PKGMANDIR}/man8/exim.8 .include "../../devel/pcre/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile index 5a23bb4aeee..298fabbd38f 100644 --- a/mail/exmh/Makefile +++ b/mail/exmh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2006/10/20 08:15:14 dsainty Exp $ +# $NetBSD: Makefile,v 1.45 2007/01/07 09:13:58 rillig Exp $ DISTNAME= exmh-2.7.2 CATEGORIES= mail tk @@ -32,7 +32,7 @@ do-build: FILESDIR=${FILESDIR} ${SH} ${FILESDIR}/build do-install: - ${INSTALL_MAN} ${WRKSRC}/exmh.l ${PREFIX}/man/man1/exmh.1 + ${INSTALL_MAN} ${WRKSRC}/exmh.l ${PREFIX}/${PKGMANDIR}/man1/exmh.1 for binfile in exmh-async exmh-bg exmh-strip exmh ftp.expect; do \ ${INSTALL_SCRIPT} ${WRKSRC}/$$binfile ${PREFIX}/bin; \ done diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile index 69df421e9b1..499cbee56f4 100644 --- a/mail/ezmlm/Makefile +++ b/mail/ezmlm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/08/19 04:44:09 schmonz Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:13:58 rillig Exp $ # .include "../../mail/ezmlm/Makefile.common" @@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews # and don't provide compatibility symlinks. DJB_RESTRICTED= YES -INSTALLATION_DIRS= bin man man/man1 man/man5 man/cat1 man/cat5 +INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat5 .include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index 021d0252b8c..77e4d218339 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2006/03/04 21:30:00 jlam Exp $ +# $NetBSD: Makefile,v 1.69 2007/01/07 09:13:58 rillig Exp $ DISTNAME= fetchmail-6.2.5.5 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} @@ -19,11 +19,11 @@ PATCHDIR= ${.CURDIR}/../../mail/fetchmail/patches PYTHON_PATCH_SCRIPTS= fetchmailconf -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf ${PREFIX}/bin - ${LN} -s fetchmail.1 ${PREFIX}/man/man1/fetchmailconf.1 + ${LN} -s fetchmail.1 ${PREFIX}/${PKGMANDIR}/man1/fetchmailconf.1 .include "../../lang/python/application.mk" .include "../../x11/py-Tk/buildlink3.mk" diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile index e32b76092cf..cc2d343ded9 100644 --- a/mail/gotmail/Makefile +++ b/mail/gotmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:09:55 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:13:58 rillig Exp $ # DISTNAME= gotmail-0.8.6 @@ -29,6 +29,6 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gotmail ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gotmail ${INSTALL_DATA} ${WRKSRC}/sample.gotmailrc ${EGDIR} - ${INSTALL_MAN} ${WRKSRC}/gotmail.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/gotmail.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile index b11802891bd..632d1318315 100644 --- a/mail/imap-uw-utils/Makefile +++ b/mail/imap-uw-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:18 reed Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:58 rillig Exp $ DISTNAME= imap-utils PKGNAME= imap-uw-utils-20050108 @@ -19,7 +19,7 @@ SRCDIRS= icat ifrom CFLAGS+= -I${BUILDLINK_PREFIX.imap-uw}/include/c-client LIBS+= -lc-client -lssl -lcrypto -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: @for prog in ${SRCDIRS}; do \ @@ -33,7 +33,7 @@ do-install: ${ECHO} "==> Installing $${prog}"; \ cd ${WRKSRC}/$${prog}; \ ${INSTALL_PROGRAM} $${prog} ${PREFIX}/bin; \ - ${INSTALL_MAN} $${prog}.1 ${PREFIX}/man/man1; \ + ${INSTALL_MAN} $${prog}.1 ${PREFIX}/${PKGMANDIR}/man1; \ done .include "../../mail/imap-uw/buildlink3.mk" diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile index a08cd9841fa..11166b9ba58 100644 --- a/mail/ja-squirrelmail/Makefile +++ b/mail/ja-squirrelmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2006/12/07 05:38:44 taca Exp $ +# $NetBSD: Makefile,v 1.37 2007/01/07 09:13:58 rillig Exp $ DISTNAME= squirrelmail-1.4.9a PKGNAME= ja-${DISTNAME} @@ -83,7 +83,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/ ${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/ ${MV} ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \ - ${PREFIX}/man/man8/squirrelmail-conf.pl.8 + ${PREFIX}/${PKGMANDIR}/man8/squirrelmail-conf.pl.8 .include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index d30203fcfb0..0761f80e487 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/07/04 09:13:49 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:58 rillig Exp $ # DISTNAME= MailScanner-4.30.3-2 @@ -88,7 +88,7 @@ SUBST_SED.systemdefs= -e s,/bin/rm,${RM},g SUBST_SED.systemdefs= -e s,/bin/sed,${SED},g .endif -INSTALLATION_DIRS= bin man/man5 man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 # get rid of CVS backup files post-extract: @@ -123,8 +123,8 @@ do-install: ${INSTALL_DATA_DIR} ${DOCSDIR} cd ${WRKSRC}/docs && ${FIND} * -type d -exec ${INSTALL_DATA_DIR} ${DOCSDIR}'/{}' \; cd ${WRKSRC}/docs && ${FIND} * -type f -exec ${INSTALL_DATA} '{}' ${DOCSDIR} \; - cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.conf.5 ${PREFIX}/man/man5 - cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.8 ${PREFIX}/man/man8 + cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.conf.5 ${PREFIX}/${PKGMANDIR}/man5 + cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.8 ${PREFIX}/${PKGMANDIR}/man8 post-install: ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile index 0ed9b18f58d..d55578110ae 100644 --- a/mail/mailsync/Makefile +++ b/mail/mailsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/04/22 09:22:11 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:58 rillig Exp $ # DISTNAME= mailsync_5.2.1.orig @@ -30,7 +30,7 @@ SUBST_MESSAGE.conf= Fixing configure script. DOCS= COPYING NEWS README THANKS TODO doc/ABSTRACT doc/HACKING -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailsync @@ -38,7 +38,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mailsync ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/doc/examples/mailsync \ ${PREFIX}/share/examples/mailsync/dot.mailsync - ${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${PREFIX}/${PKGMANDIR}/man1 .for d in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${d} ${PREFIX}/share/doc/mailsync .endfor diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile index e4388d79219..da4e3028e68 100644 --- a/mail/mailwrapper/Makefile +++ b/mail/mailwrapper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/03/14 01:14:30 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:58 rillig Exp $ DISTNAME= mailwrapper-19990412 PKGREVISION= 4 @@ -23,7 +23,7 @@ MAILWRAPPEES= /usr/bin/mailq \ /usr/sbin/sendmail /usr/lib/sendmail FILES_SUBST+= MAILWRAPPEES=${MAILWRAPPEES:Q} -INSTALLATION_DIRS= man/cat5 man/cat8 man/man5 man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin do-configure: cd ${WRKSRC}; \ diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile index 3f50c6ae8d0..607c78daca0 100644 --- a/mail/mess822/Makefile +++ b/mail/mess822/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/02/19 00:41:49 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:58 rillig Exp $ # DISTNAME= mess822-0.58 @@ -29,7 +29,7 @@ CONF_FILES+= ${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat DJB_BUILD_TARGETS= install instcheck -INSTALLATION_DIRS= bin include lib man man/cat1 man/cat3 man/cat5 man/cat8 +INSTALLATION_DIRS= bin include lib man ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat3 ${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8 INSTALLATION_DIRS+= man/man1 man/man3 man/man5 man/man8 share/examples/mess822 SUBST_FILES.djbware+= cdb_seek.c leapsecs_read.c diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile index 13d6a006782..889c11852f0 100644 --- a/mail/milter-regex/Makefile +++ b/mail/milter-regex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/06/14 19:13:00 tron Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:58 rillig Exp $ DISTNAME= milter-regex-1.6 PKGREVISION= 1 @@ -9,7 +9,7 @@ MAINTAINER= jdarrow@NetBSD.org HOMEPAGE= http://www.benzedrine.cx/milter-regex.html COMMENT= Milter enabling regular expression filtering -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin PKG_GROUPS= smmsp PKG_USERS= smmsp:smmsp @@ -34,7 +34,7 @@ post-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/milter-regex.8 ${PREFIX}/man/man8 + ${INSTALL_DATA} ${WRKSRC}/milter-regex.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../mail/libmilter/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/mail/mini_sendmail/Makefile.common b/mail/mini_sendmail/Makefile.common index 444aefd8fa4..1e2a7c4034f 100644 --- a/mail/mini_sendmail/Makefile.common +++ b/mail/mini_sendmail/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2005/06/29 22:01:19 is Exp $ +# $NetBSD: Makefile.common,v 1.13 2007/01/07 09:13:58 rillig Exp $ # DISTNAME= mini_sendmail-1.3.6 @@ -16,7 +16,7 @@ FILESDIR= ${.CURDIR}/../mini_sendmail/files EGDIR= ${PREFIX}/share/examples/mini_sendmail -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin .include "../../mk/bsd.prefs.mk" diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 5b3235c1358..3b72e28af5e 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.147 2006/12/11 12:46:51 salo Exp $ +# $NetBSD: Makefile,v 1.148 2007/01/07 09:13:58 rillig Exp $ DISTNAME= mutt-1.4.2.2i PKGREVISION= 3 @@ -101,7 +101,7 @@ pre-install: post-install: .if (${PKG_INSTALLATION_TYPE} == "pkgviews") - ${MV} ${PREFIX}/man/man5/mutt-mbox.5 ${PREFIX}/man/man5/mbox.5 + ${MV} ${PREFIX}/${PKGMANDIR}/man5/mutt-mbox.5 ${PREFIX}/${PKGMANDIR}/man5/mbox.5 .endif .include "../../mk/bsd.pkg.mk" diff --git a/mail/nail/Makefile b/mail/nail/Makefile index d57a1f109bc..ebcd15234b8 100644 --- a/mail/nail/Makefile +++ b/mail/nail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/12/29 06:21:51 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2007/01/07 09:13:58 rillig Exp $ DISTNAME= nail-11.25 CATEGORIES= mail @@ -29,11 +29,11 @@ EGDIR= ${PREFIX}/share/examples/nail CONF_FILES= ${EGDIR}/nail.rc ${PKG_SYSCONFDIR}/nail.rc -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/nail.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/nail.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/nail.rc ${EGDIR} diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile index a1a3a1fbd50..486a1938e3d 100644 --- a/mail/offlineimap/Makefile +++ b/mail/offlineimap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:01 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= offlineimap_${_OFFLINEIMAP_VER} @@ -21,13 +21,13 @@ PYDISTUTILSPKG= yes PYTHON_PATCH_SCRIPTS= bin/offlineimap PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q} -INSTALLATION_DIRS= man/man1 share/examples/offlineimap +INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/examples/offlineimap post-install: .for _f_ in offlineimap.conf offlineimap.conf.minimal ${INSTALL_DATA} ${WRKSRC}/${_f_} ${PREFIX}/share/examples/offlineimap/${_f_} .endfor - ${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${PREFIX}/man/man1/offlineimap.1 + ${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${PREFIX}/${PKGMANDIR}/man1/offlineimap.1 .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile index 8602b3f3b77..3f766e188fa 100644 --- a/mail/pfqueue/Makefile +++ b/mail/pfqueue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:01 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= pfqueue-0.1.4 @@ -12,11 +12,11 @@ COMMENT= Real-time queue scanner for postfix GNU_CONFIGURE= yes INCOMPAT_CURSES= NetBSD-1.*-* -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pfqueue ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/pfqueue.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/pfqueue.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/pine/Makefile b/mail/pine/Makefile index 9716f06e3cf..813b74b874d 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2006/05/31 18:22:24 ghen Exp $ +# $NetBSD: Makefile,v 1.112 2007/01/07 09:13:59 rillig Exp $ DISTNAME= pine4.64 PKGNAME= pine-4.64 @@ -55,7 +55,7 @@ PINE_LDAPCFLAGS= LDAPCFLAGS="-DENABLE_LDAP" PINE_LDAPLIBS= LDAPLIBS="-lldap -llber" .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 # Make sure the imap lib that comes with pine isn't # used (see http://www.securityfocus.com/advisories/2646) @@ -84,9 +84,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/rpdump ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/rpload ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pine - ${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/rpdump.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/rpload.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/rpdump.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/rpload.1 ${PREFIX}/${PKGMANDIR}/man1 ( ${ECHO} '# (This file is not part of the pine distribution! - HF)' ; \ ${PREFIX}/bin/pine -conf ) | ${SED} \ -e 's|^\(use-only-domain-name\)=.*$$|\1=No|g' \ diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile index 22f798be924..f0686ca8908 100644 --- a/mail/popa3d/Makefile +++ b/mail/popa3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/10/07 18:14:11 reed Exp $ +# $NetBSD: Makefile,v 1.47 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= popa3d-1.0.2 @@ -29,11 +29,11 @@ SUBST_FILES.params= params.h SUBST_SED.params= -e 's,/var/empty,${PREFIX}/share/empty,' \ -e 's,@@POPA3D_USER@@,"${POPA3D_USER}",' -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_PROGRAM} -m 500 ${WRKSRC}/popa3d ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/popa3d.8 ${PREFIX}/man/man8/ + ${INSTALL_DATA} ${WRKSRC}/popa3d.8 ${PREFIX}/${PKGMANDIR}/man8/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/popa3d cd ${WRKSRC} && ${INSTALL_DATA} DESIGN INSTALL LICENSE \ ${PREFIX}/share/doc/popa3d diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile index 645445f83f2..3af814f9d13 100644 --- a/mail/poppassd/Makefile +++ b/mail/poppassd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/06/01 22:27:17 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= qpopper${VERSION} @@ -22,7 +22,7 @@ MAKE_ENV+= ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q} .include "options.mk" -INSTALLATION_DIRS= man/man8 share/doc libexec +INSTALLATION_DIRS= ${PKGMANDIR}/man8 share/doc libexec do-build: .for DIR in common password @@ -34,7 +34,7 @@ do-build: do-install: cd ${WRKSRC}/password; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} - ${INSTALL_MAN} ${WRKSRC}/man/poppassd.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/man/poppassd.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA} ${WRKSRC}/License.txt \ ${PREFIX}/share/doc/poppassd.License; diff --git a/mail/poppy/Makefile b/mail/poppy/Makefile index 6c9b07419bf..5c238287bcc 100644 --- a/mail/poppy/Makefile +++ b/mail/poppy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:13 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= poppy-3.1 @@ -13,10 +13,10 @@ NO_BUILD= YES USE_TOOLS+= perl:run REPLACE_PERL= poppy -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/poppy ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/poppy.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/poppy.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index c9cb44dcff7..42ff72c8028 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/12/23 04:36:45 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= procmail-3.22 @@ -23,7 +23,7 @@ BUILD_DEFS+= PROCMAIL_MAILSPOOLHOME PROCMAIL_TRUSTED_IDS PROCMAIL_TRUSTED_IDS?=\ "root","daemon","uucp","mail","x400","network","list","slist","lists","news",0 -INSTALLATION_DIRS= bin man/man1 man/man5 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 pre-configure: ${ECHO} "#define TRUSTED_IDS {${PROCMAIL_TRUSTED_IDS:Q}}" \ @@ -47,10 +47,10 @@ do-install: done; \ ${INSTALL_SCRIPT} mailstat ${PREFIX}/bin/mailstat; \ for f in procmail.1 formail.1 lockfile.1; do \ - ${INSTALL_MAN} $$f ${PREFIX}/man/man1/$$f; \ + ${INSTALL_MAN} $$f ${PREFIX}/${PKGMANDIR}/man1/$$f; \ done; \ for f in procmailex.5 procmailrc.5 procmailsc.5; do \ - ${INSTALL_MAN} $$f ${PREFIX}/man/man5/$$f; \ + ${INSTALL_MAN} $$f ${PREFIX}/${PKGMANDIR}/man5/$$f; \ done ${SH} ${WRKSRC}/suid.sh .endif diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile index f0bdd4213f5..169d4f59517 100644 --- a/mail/qmail-qfilter/Makefile +++ b/mail/qmail-qfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/08/02 02:36:17 schmonz Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= qmail-qfilter-2.1 @@ -27,7 +27,7 @@ SUBST_SED.paths= -e 's|/tmp|${QMAIL_QFILTER_TMPDIR}|g' SUBST_SED.paths+= -e 's|/var/qmail|${QMAILDIR}|g' SUBST_MESSAGE.paths= Fixing paths. -INSTALLATION_DIRS= bin man man/man1 share/examples/qmail-qfilter +INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 share/examples/qmail-qfilter DJB_RESTRICTED= NO DJB_MAKE_TARGETS= NO diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile index ef783732126..2df7c495b2e 100644 --- a/mail/rss2email/Makefile +++ b/mail/rss2email/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/07/01 19:32:40 schmonz Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= rss2email-2.59 @@ -27,7 +27,7 @@ SUBST_SED.bin+= -e 's|@PYTHONBIN@|${PYTHONBIN}|g' SHAREDIR= ${PREFIX}/share/rss2email EGDIR= ${PREFIX}/share/examples/rss2email -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: ${_PKG_SILENT}${_PKG_DEBUG} \ @@ -39,7 +39,7 @@ do-install: ${INSTALL_SCRIPT} rss2email.py ${SHAREDIR}; \ ${INSTALL_DATA_DIR} ${EGDIR}; \ ${INSTALL_DATA} config.py ${EGDIR}; \ - ${INSTALL_MAN} r2e.1 ${PREFIX}/man/man1; \ + ${INSTALL_MAN} r2e.1 ${PREFIX}/${PKGMANDIR}/man1; \ ${INSTALL_SCRIPT} r2e ${PREFIX}/bin .include "../../lang/python/application.mk" diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile index 46615177c36..6c49d7adcad 100644 --- a/mail/sigrot/Makefile +++ b/mail/sigrot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/10/04 21:47:17 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:59 rillig Exp $ DISTNAME= sigrot_1.2-1 PKGNAME= sigrot-1.2 @@ -16,14 +16,14 @@ USE_TOOLS+= gmake DOCDIR= ${PREFIX}/share/doc/sigrot EGDIR= ${PREFIX}/share/examples/sigrot -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: cd ${WRKSRC} && ${CC} sigrot.c -o sigrot do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sigrot ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/sigrot.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/sigrot.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/copyright ${DOCDIR}/COPYRIGHT ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}/INSTALL diff --git a/mail/sma/Makefile b/mail/sma/Makefile index 314097f7658..9e19c36438c 100644 --- a/mail/sma/Makefile +++ b/mail/sma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/11/14 12:31:30 obache Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:59 rillig Exp $ DISTNAME= sma-1.4 CATEGORIES= mail @@ -24,7 +24,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 do-install: cd ${WRKSRC}; \ ${INSTALL_PROGRAM} sma ${PREFIX}/bin; \ - ${INSTALL_MAN} docs/sma.8 ${PREFIX}/man/man8; \ + ${INSTALL_MAN} docs/sma.8 ${PREFIX}/${PKGMANDIR}/man8; \ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sma; \ ${INSTALL_DATA} README ${PREFIX}/share/doc/sma; \ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sma; \ diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile index 96f60fc65d2..d276d3d2887 100644 --- a/mail/smtpfeed/Makefile +++ b/mail/smtpfeed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/06/03 00:45:15 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2007/01/07 09:13:59 rillig Exp $ DISTNAME= smtpfeed-1.18 PKGREVISION= 1 @@ -29,7 +29,7 @@ DOCS= COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \ BUILD_DEFS+= USE_INET6 -INSTALLATION_DIRS= libexec man/man8 share/doc/smtpfeed +INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 share/doc/smtpfeed .include "../../mk/bsd.prefs.mk" @@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--enable-ipv6 .endif post-install: - ${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${PREFIX}/${PKGMANDIR}/man8 for i in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/smtpfeed; \ done -- cgit v1.2.3