diff options
author | tv <tv@pkgsrc.org> | 2007-01-20 20:08:31 +0000 |
---|---|---|
committer | tv <tv@pkgsrc.org> | 2007-01-20 20:08:31 +0000 |
commit | be94bcce2319428790ecaf87a4702db3031416c7 (patch) | |
tree | e2b1a4c0453e17225e166ec316e00157bfbc72ea | |
parent | 748481102c766bfa9b25cc8769d40f04ad4c1605 (diff) | |
download | pkgsrc-be94bcce2319428790ecaf87a4702db3031416c7.tar.gz |
REPLACE_PERL works even if Perl is not registered as a dependency.
So, compile socketmap support in unconditionally (as the Perl scripts
are actually only examples of socketmap functionality; any language can be
used in reality). Remove socketmap related OPTIONs completely.
-rw-r--r-- | mail/sendmail/Makefile | 20 | ||||
-rw-r--r-- | mail/sendmail/PLIST | 4 | ||||
-rw-r--r-- | mail/sendmail/PLIST.socketmap | 4 | ||||
-rw-r--r-- | mail/sendmail/files/site.config.m4 | 3 | ||||
-rw-r--r-- | mail/sendmail/files/site.config.m4-socketmap | 4 | ||||
-rw-r--r-- | mail/sendmail/options.mk | 13 |
6 files changed, 13 insertions, 35 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 2399c1774d6..feade8e2d06 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.94 2006/12/29 21:44:09 markd Exp $ +# $NetBSD: Makefile,v 1.95 2007/01/20 20:08:31 tv Exp $ .include "../../mail/sendmail/Makefile.common" PKGNAME= sendmail-${DIST_VERS} -PKGREVISION= 3 +PKGREVISION= 4 COMMENT= The well known Mail Transport Agent CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]* @@ -35,6 +35,8 @@ SUBST_SED.paths+= -e "s|@@PREFIX@@|${PREFIX}|g" SUBST_SED.paths+= -e "s|@@SMRSH_CMDDIR@@|${SMRSH_CMDDIR}|g" SUBST_MESSAGE.paths= Fixing paths. +REPLACE_PERL= contrib/socketmapClient.pl contrib/socketmapServer.pl + post-patch: make-sendmail-siteconfig .if !empty(PKG_OPTIONS:Mtcpwrappers) ${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG} @@ -54,10 +56,6 @@ post-patch: make-sendmail-siteconfig .if !empty(PKG_OPTIONS:Msasl) ${CAT} ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG} .endif -.if !empty(PKG_OPTIONS:Msendmail-socketmap) - ${CAT} ${FILESDIR}/site.config.m4-socketmap >>${SITECONFIG} -PLIST_SRC+= ${PKGDIR}/PLIST.socketmap -.endif post-extract: ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf @@ -88,14 +86,8 @@ post-install: ${INSTALL_DATA} \ ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsmutil/libsmutil.a \ ${PREFIX}/lib - -.if !empty(PKG_OPTIONS:Msendmail-socketmap) - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/socketmapClient.pl \ - ${PREFIX}/share/examples/sendmail - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/socketmapServer.pl \ - ${PREFIX}/share/examples/sendmail -.endif - + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/socketmap*.pl \ + ${PREFIX}/share/examples/sendmail/ ${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${PREFIX}/share/doc/sendmail ${INSTALL_DATA} ${WRKSRC}/cf/README ${PREFIX}/share/doc/sendmail ${INSTALL_DATA} ${WRKSRC}/sendmail/SECURITY ${PREFIX}/share/doc/sendmail diff --git a/mail/sendmail/PLIST b/mail/sendmail/PLIST index 6c116a31a47..c26b97b5668 100644 --- a/mail/sendmail/PLIST +++ b/mail/sendmail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2006/06/07 14:48:28 joerg Exp $ +@comment $NetBSD: PLIST,v 1.13 2007/01/20 20:08:32 tv Exp $ bin/hoststat bin/mailq bin/newaliases @@ -30,6 +30,8 @@ share/doc/sendmail/op.ps share/examples/rc.d/sendmail share/examples/rc.d/smmsp share/examples/sendmail/mailer.conf +share/examples/sendmail/socketmapClient.pl +share/examples/sendmail/socketmapServer.pl share/misc/helpfile share/sendmail/README share/sendmail/cf/Build diff --git a/mail/sendmail/PLIST.socketmap b/mail/sendmail/PLIST.socketmap deleted file mode 100644 index 85266472e85..00000000000 --- a/mail/sendmail/PLIST.socketmap +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST.socketmap,v 1.1 2004/08/30 20:16:28 adrianp Exp $ -share/examples/sendmail/socketmapClient.pl -share/examples/sendmail/socketmapServer.pl -@dirrm share/examples/sendmail diff --git a/mail/sendmail/files/site.config.m4 b/mail/sendmail/files/site.config.m4 index 59d3c2760f1..72aa9b20f5f 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.7 2006/10/13 13:58:11 tv Exp $ +# $NetBSD: site.config.m4,v 1.8 2007/01/20 20:08:32 tv Exp $ # pathnames specific to pkgsrc # @@ -18,6 +18,7 @@ define(`confMAN5EXT', `5') define(`confMAN8EXT', `8') APPENDDEF(`confENVDEF', `-I${PREFIX}/include -DSMRSH_CMDDIR=\"${SMRSH_CMDDIR}\"') APPENDDEF(`confLIBS', `-L${PREFIX}/lib') +APPENDDEF(`confMAPDEF', `-DSOCKETMAP') # the following are handled by pkgsrc define(`confINST_DEP',`') diff --git a/mail/sendmail/files/site.config.m4-socketmap b/mail/sendmail/files/site.config.m4-socketmap deleted file mode 100644 index c1bed7f2d43..00000000000 --- a/mail/sendmail/files/site.config.m4-socketmap +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: site.config.m4-socketmap,v 1.1 2004/08/30 20:16:28 adrianp Exp $ - -# enable socketmap lookups -APPENDDEF(`confMAPDEF', `-DSOCKETMAP') diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk index 4513f640dd8..86b14a58aa8 100644 --- a/mail/sendmail/options.mk +++ b/mail/sendmail/options.mk @@ -1,11 +1,10 @@ -# $NetBSD: options.mk,v 1.15 2006/05/31 18:22:24 ghen Exp $ +# $NetBSD: options.mk,v 1.16 2007/01/20 20:08:32 tv Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail -PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl tls tcpwrappers sendmail-socketmap +PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl tls tcpwrappers PKG_SUGGESTED_OPTIONS= tcpwrappers PKG_OPTIONS_LEGACY_OPTS+= starttls:tls -PKG_OPTIONS_LEGACY_OPTS+= socketmap:sendmail-socketmap .include "../../mk/bsd.options.mk" @@ -47,14 +46,6 @@ PKG_OPTIONS_LEGACY_OPTS+= socketmap:sendmail-socketmap .endif ### -### Enable Sendmail SOCKETMAP support -### -.if !empty(PKG_OPTIONS:Msendmail-socketmap) -USE_TOOLS+= perl:run -REPLACE_PERL= contrib/socketmapClient.pl contrib/socketmapServer.pl -.endif - -### ### IPv6 support. ### .if !empty(PKG_OPTIONS:Minet6) |