summaryrefslogtreecommitdiff
path: root/mail/sendmail
diff options
context:
space:
mode:
authorjlam <jlam>2006-06-08 02:26:32 +0000
committerjlam <jlam>2006-06-08 02:26:32 +0000
commiteedb072b33638d0050951fe9c0efd7bf8399672f (patch)
tree63e5d343ee498fb8606e1958b2b8b5f79f3479b8 /mail/sendmail
parente25eae0ee09108f8b89d8dc0fb997268f4e81649 (diff)
downloadpkgsrc-eedb072b33638d0050951fe9c0efd7bf8399672f.tar.gz
Fix names of installed manual pages. The PLIST expects that the pages
are named *.[1-9], so force the pkgsrc installation of sendmail to always install the manual pages with those names on all platforms. This fixes the problem noted in: http://mail-index.netbsd.org/pkgsrc-users/2006/06/07/0007.html
Diffstat (limited to 'mail/sendmail')
-rw-r--r--mail/sendmail/Makefile.common11
-rw-r--r--mail/sendmail/files/site.config.m47
-rw-r--r--mail/sendmail/files/site.config.m4-linux8
-rw-r--r--mail/sendmail/files/site.config.m4-solaris8
4 files changed, 7 insertions, 27 deletions
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 67f3d291c26..2240b32d444 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2006/06/06 22:03:36 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.36 2006/06/08 02:26:32 jlam Exp $
#
# Makefile fragment shared with libmilter
#
@@ -45,13 +45,4 @@ make-sendmail-siteconfig:
${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
.endif
.endif
-
-.if ${OPSYS} == "SunOS"
- ${CAT} ${FILESDIR}/site.config.m4-solaris >>${SITECONFIG}
-.endif
-
-.if ${OPSYS} == "Linux"
- ${CAT} ${FILESDIR}/site.config.m4-linux >>${SITECONFIG}
-.endif
-
${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
diff --git a/mail/sendmail/files/site.config.m4 b/mail/sendmail/files/site.config.m4
index 305a6ca90bc..705d3c77da2 100644
--- a/mail/sendmail/files/site.config.m4
+++ b/mail/sendmail/files/site.config.m4
@@ -1,4 +1,4 @@
-# $NetBSD: site.config.m4,v 1.4 2006/06/07 14:48:28 joerg Exp $
+# $NetBSD: site.config.m4,v 1.5 2006/06/08 02:26:32 jlam Exp $
# pathnames specific to pkgsrc
#
@@ -11,5 +11,10 @@ define(`confINSTALL_RAWMAN', 'yes')
define(`confDONT_INSTALL_CATMAN', 'yes')
define(`confMANROOT', `${PREFIX}/${PKGMANDIR}/man')
define(`confMANROOTMAN', `${PREFIX}/${PKGMANDIR}/man')
+define(`confMAN1EXT', `1')
+define(`confMAN3EXT', `3')
+define(`confMAN4EXT', `4')
+define(`confMAN5EXT', `5')
+define(`confMAN8EXT', `8')
APPENDDEF(`confENVDEF', `-I${PREFIX}/include')
APPENDDEF(`confLIBS', `-L${PREFIX}/lib')
diff --git a/mail/sendmail/files/site.config.m4-linux b/mail/sendmail/files/site.config.m4-linux
deleted file mode 100644
index e4ab28118da..00000000000
--- a/mail/sendmail/files/site.config.m4-linux
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: site.config.m4-linux,v 1.1 2004/08/30 20:16:28 adrianp Exp $
-
-# man pathnames specific for Linux
-define(`confMAN1EXT', `0')
-define(`confMAN3EXT', `0')
-define(`confMAN4EXT', `0')
-define(`confMAN5EXT', `0')
-define(`confMAN8EXT', `0')
diff --git a/mail/sendmail/files/site.config.m4-solaris b/mail/sendmail/files/site.config.m4-solaris
deleted file mode 100644
index 408f742792d..00000000000
--- a/mail/sendmail/files/site.config.m4-solaris
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: site.config.m4-solaris,v 1.3 2004/08/30 20:16:28 adrianp Exp $
-
-# man pathnames specific for Solaris
-define(`confMAN1EXT', `0')
-define(`confMAN3EXT', `0')
-define(`confMAN4EXT', `0')
-define(`confMAN5EXT', `0')
-define(`confMAN8EXT', `0')