Sun Apr 20 17:36:15 2008 UTC ()
Fixes for new PLIST magic


(adrianp)
diff -r1.7 -r1.8 pkgsrc/mail/dkim-milter/PLIST
diff -r1.5 -r1.6 pkgsrc/mail/dkim-milter/options.mk
cvs diff -r1.7 -r1.8 pkgsrc/mail/dkim-milter/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/dkim-milter/PLIST 2008/04/20 17:20:20 1.7
+++ pkgsrc/mail/dkim-milter/PLIST 2008/04/20 17:36:15 1.8
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1@comment $NetBSD: PLIST,v 1.7 2008/04/20 17:20:20 adrianp Exp $ 1@comment $NetBSD: PLIST,v 1.8 2008/04/20 17:36:15 adrianp Exp $
2${PLIST.arlib}lib/libar.a 2${PLIST.arlib}lib/libar.a
3${PLIST.arlib}man/man3/ar.3 3${PLIST.arlib}man/man3/ar.3
4lib/libdkim.a 4lib/libdkim.a
5include/dkim.h 5include/dkim.h
6libexec/dkim-filter 6libexec/dkim-filter
7bin/dkim-genkey 7bin/dkim-genkey
8${WITH_STATS}bin/dkim-stats 8${PLIST.stats}bin/dkim-stats
9bin/dkim-testkey 9bin/dkim-testkey
10bin/dkim-testssp 10bin/dkim-testssp
11man/man5/dkim-filter.conf.5 11man/man5/dkim-filter.conf.5
12man/man8/dkim-filter.8 12man/man8/dkim-filter.8
13man/man8/dkim-genkey.8 13man/man8/dkim-genkey.8
14${WITH_STATS}man/man8/dkim-stats.8 14${PLIST.stats}man/man8/dkim-stats.8
15man/man8/dkim-testkey.8 15man/man8/dkim-testkey.8
16man/man8/dkim-testssp.8 16man/man8/dkim-testssp.8
17share/doc/dkim-milter/FEATURES 17share/doc/dkim-milter/FEATURES
18share/doc/dkim-milter/INSTALL 18share/doc/dkim-milter/INSTALL
19share/doc/dkim-milter/KNOWNBUGS 19share/doc/dkim-milter/KNOWNBUGS
20share/doc/dkim-milter/README 20share/doc/dkim-milter/README
21share/doc/dkim-milter/RELEASE_NOTES 21share/doc/dkim-milter/RELEASE_NOTES
22share/examples/dkim-milter/dkim-filter.conf.sample 22share/examples/dkim-milter/dkim-filter.conf.sample
23share/doc/dkim-milter/draft-hoffman-dac-vbr-02.txt 23share/doc/dkim-milter/draft-hoffman-dac-vbr-02.txt
24share/doc/dkim-milter/draft-ietf-dkim-deployment-01.txt 24share/doc/dkim-milter/draft-ietf-dkim-deployment-01.txt
25share/doc/dkim-milter/draft-ietf-dkim-overview-09.txt 25share/doc/dkim-milter/draft-ietf-dkim-overview-09.txt
26share/doc/dkim-milter/draft-ietf-dkim-ssp-03.txt 26share/doc/dkim-milter/draft-ietf-dkim-ssp-03.txt
27share/doc/dkim-milter/draft-kucherawy-sender-auth-header-14.txt 27share/doc/dkim-milter/draft-kucherawy-sender-auth-header-14.txt
cvs diff -r1.5 -r1.6 pkgsrc/mail/dkim-milter/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/dkim-milter/options.mk 2008/04/20 17:20:20 1.5
+++ pkgsrc/mail/dkim-milter/options.mk 2008/04/20 17:36:15 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.5 2008/04/20 17:20:20 adrianp Exp $ 1# $NetBSD: options.mk,v 1.6 2008/04/20 17:36:15 adrianp Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.dkim-milter 3PKG_OPTIONS_VAR= PKG_OPTIONS.dkim-milter
4PKG_SUPPORTED_OPTIONS= inet6 dkim-milter-arlib debug dkim-stats 4PKG_SUPPORTED_OPTIONS= inet6 dkim-milter-arlib debug dkim-stats
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8### 8###
9### IPv6 support. 9### IPv6 support.
10### 10###
11.if !empty(PKG_OPTIONS:Minet6) 11.if !empty(PKG_OPTIONS:Minet6)
12SUBST_SED.libs+= -e 's|@INET6@||g' 12SUBST_SED.libs+= -e 's|@INET6@||g'
13.else 13.else
14SUBST_SED.libs+= -e 's|@INET6@|dnl|g' 14SUBST_SED.libs+= -e 's|@INET6@|dnl|g'
@@ -29,25 +29,25 @@ SUBST_SED.libs+= -e 's|@DEBUG@|dnl|g' @@ -29,25 +29,25 @@ SUBST_SED.libs+= -e 's|@DEBUG@|dnl|g'
29PLIST_VARS+= arlib 29PLIST_VARS+= arlib
30.if !empty(PKG_OPTIONS:Mdkim-milter-arlib) 30.if !empty(PKG_OPTIONS:Mdkim-milter-arlib)
31PLIST.arlib= yes 31PLIST.arlib= yes
32SUBST_SED.libs+= -e 's|@RESOLVLIB@||g' 32SUBST_SED.libs+= -e 's|@RESOLVLIB@||g'
33SUBST_SED.libs+= -e 's|@ARLIB@||g' 33SUBST_SED.libs+= -e 's|@ARLIB@||g'
34.else 34.else
35SUBST_SED.libs+= -e 's|@RESOLVLIB@|resolv bind|g' 35SUBST_SED.libs+= -e 's|@RESOLVLIB@|resolv bind|g'
36SUBST_SED.libs+= -e 's|@ARLIB@|dnl|g' 36SUBST_SED.libs+= -e 's|@ARLIB@|dnl|g'
37.endif 37.endif
38 38
39### 39###
40### Install dkim-stats(8) which outputs dkim-milter statistics 40### Install dkim-stats(8) which outputs dkim-milter statistics
41### 41###
 42PLIST_VARS+= stats
42.if !empty(PKG_OPTIONS:Mdkim-stats) 43.if !empty(PKG_OPTIONS:Mdkim-stats)
43.include "../../mk/db1.builtin.mk" 44.include "../../mk/db1.builtin.mk"
44PLIST_SUBST+= WITH_STATS='' 45PLIST.stats= yes
45SUBST_SED.libs+= -e 's|@STATS@||g' 46SUBST_SED.libs+= -e 's|@STATS@||g'
46SUBST_SED.libs+= -e 's|@MAN_STATS@|dkim-stats.8|g' 47SUBST_SED.libs+= -e 's|@MAN_STATS@|dkim-stats.8|g'
47SUBST_SED.libs+= -e 's|@DBLIB@|db|g' 48SUBST_SED.libs+= -e 's|@DBLIB@|db|g'
48.else 49.else
49PLIST_SUBST+= WITH_STATS='@comment ' 
50SUBST_SED.libs+= -e 's|@STATS@|dnl|g' 50SUBST_SED.libs+= -e 's|@STATS@|dnl|g'
51SUBST_SED.libs+= -e 's|@MAN_STATS@||g' 51SUBST_SED.libs+= -e 's|@MAN_STATS@||g'
52SUBST_SED.libs+= -e 's|@DBLIB@||g' 52SUBST_SED.libs+= -e 's|@DBLIB@||g'
53.endif 53.endif