Bump REVISION rather than EPOCH for smtp-vilter, then it's OK.

I'm tempted to split libmilter off to a sub package at some point (not now 
though :)


On 16 September 2014 20:33:02 BST, j...@wxcvbn.org wrote:
>Stuart Henderson <st...@openbsd.org> writes:
>
>> On 2014/09/16 13:57, Jérémie Courrèges-Anglas wrote:
>>> This is the only feedback I have received.  Since Matthieu has
>unlinked
>>> sendmail yesterday, the clock is ticking.
>>
>> These ports (which are currently broken) will need the dependency to
>be added ..
>>
>> $ sqlite3 /usr/local/share/sqlports "select fullpkgpath from wantlib
>where value='milter'"
>> mail/dkim-milter
>> mail/milter-checkrcpt
>> mail/milter-greylist
>> mail/milter-regex
>> mail/milter-spamd
>> mail/mimedefang
>> mail/py-milter
>> mail/smtp-vilter
>> mail/smtp-vilter,ldap
>> security/clamav
>
>Here are the fixes.  I didn't go farther than ''make package''.
>
>Index: mail/dkim-milter/Makefile
>===================================================================
>RCS file: /cvs/ports/mail/dkim-milter/Makefile,v
>retrieving revision 1.38
>diff -u -p -r1.38 Makefile
>--- mail/dkim-milter/Makefile  15 Jan 2014 00:20:42 -0000      1.38
>+++ mail/dkim-milter/Makefile  16 Sep 2014 17:31:09 -0000
>@@ -3,7 +3,7 @@
> COMMENT=      DKIM milter
> 
> DISTNAME=     dkim-milter-2.8.3
>-REVISION=     3
>+REVISION=     4
> CATEGORIES=   mail
> HOMEPAGE=     http://sourceforge.net/projects/dkim-milter/
> 
>@@ -17,12 +17,16 @@ PERMIT_PACKAGE_FTP=                Yes
> 
> WANTLIB=      c crypto milter pthread ssl
> 
>+LIB_DEPENDS=  mail/sendmail
>+
> EXAMPLESDIR=  share/examples/dkim-milter
> 
> post-configure:
>       @(echo "define(\`confCC', \`${CC}')"; \
>         echo "define(\`confOPTIMIZE', \`${CFLAGS}')"; \
>-        echo "define(\`confNO_MAN_BUILD')") \
>+        echo "define(\`confNO_MAN_BUILD')"; \
>+        echo "APPENDDEF(\`confINCDIRS', \`-I${LOCALBASE}/include')"; \
>+        echo "APPENDDEF(\`confLIBDIRS', \`-L${LOCALBASE}/lib ')") \
>               >${WRKSRC}/devtools/Site/site.config.m4
> 
> do-install:
>Index: mail/milter-checkrcpt/Makefile
>===================================================================
>RCS file: /cvs/ports/mail/milter-checkrcpt/Makefile,v
>retrieving revision 1.3
>diff -u -p -r1.3 Makefile
>--- mail/milter-checkrcpt/Makefile     11 Mar 2013 11:23:51 -0000      1.3
>+++ mail/milter-checkrcpt/Makefile     16 Sep 2014 18:45:01 -0000
>@@ -3,6 +3,7 @@
> COMMENT=      sendmail milter plugin for recipient checking
> 
> DISTNAME=     milter-checkrcpt-0.3
>+REVISION=     0
> CATEGORIES=   mail
> MASTER_SITES= http://www.benzedrine.cx/
> 
>@@ -13,9 +14,15 @@ MAINTAINER= Okan Demirmen <okan@openbsd.
> # BSD
> PERMIT_PACKAGE_CDROM= Yes
> 
>-WANTLIB=              c pthread milter
>+WANTLIB=      c milter pthread
>+
>+LIB_DEPENDS=  mail/sendmail
> 
> NO_TEST=      Yes
>+
>+MAKE_FLAGS=   CPPFLAGS="-I${LOCALBASE}/include" \
>+              CFLAGS="-Wall -Wstrict-prototypes ${CFLAGS}" \
>+              LDFLAGS="-L${LOCALBASE}/lib"
> 
> do-install:
>       ${INSTALL_PROGRAM} ${WRKSRC}/milter-checkrcpt ${PREFIX}/libexec
>Index: mail/milter-greylist/Makefile
>===================================================================
>RCS file: /cvs/ports/mail/milter-greylist/Makefile,v
>retrieving revision 1.14
>diff -u -p -r1.14 Makefile
>--- mail/milter-greylist/Makefile      15 Jul 2013 21:51:57 -0000      1.14
>+++ mail/milter-greylist/Makefile      16 Sep 2014 18:50:03 -0000
>@@ -3,7 +3,7 @@
> COMMENT=      greylist milter
> 
> DISTNAME=     milter-greylist-4.2.7
>-REVISION=     0
>+REVISION=     1
> CATEGORIES=   mail
> HOMEPAGE=     http://hcpnet.free.fr/milter-greylist/
> 
>@@ -17,7 +17,8 @@ PERMIT_PACKAGE_CDROM=                Yes
> 
> WANTLIB=      c pthread milter spf2
> 
>-LIB_DEPENDS=  mail/libspf2
>+LIB_DEPENDS=  mail/libspf2 \
>+              mail/sendmail
> 
> BUILD_DEPENDS=        devel/bison
> 
>Index: mail/milter-regex/Makefile
>===================================================================
>RCS file: /cvs/ports/mail/milter-regex/Makefile,v
>retrieving revision 1.26
>diff -u -p -r1.26 Makefile
>--- mail/milter-regex/Makefile 11 Mar 2013 11:23:51 -0000      1.26
>+++ mail/milter-regex/Makefile 16 Sep 2014 18:51:18 -0000
>@@ -3,6 +3,7 @@
> COMMENT=      sendmail milter plugin for regular expression filtering
> 
> DISTNAME=     milter-regex-1.9
>+REVISION=     0
> CATEGORIES=   mail
> MASTER_SITES= http://www.benzedrine.cx/
> 
>@@ -13,6 +14,12 @@ MAINTAINER= Daniel Hartmeier <dhartmei@o
> # BSD
> PERMIT_PACKAGE_CDROM= Yes
> WANTLIB=              c pthread milter
>+
>+LIB_DEPENDS=  mail/sendmail
>+
>+MAKE_FLAGS=   CPPFLAGS="-I${LOCALBASE}/include" \
>+              CFLAGS="-Wall -Wstrict-prototypes ${CFLAGS}" \
>+              LDFLAGS="-L${LOCALBASE}/lib"
> 
> NO_TEST=      Yes
> 
>Index: mail/milter-spamd/Makefile
>===================================================================
>RCS file: /cvs/ports/mail/milter-spamd/Makefile,v
>retrieving revision 1.19
>diff -u -p -r1.19 Makefile
>--- mail/milter-spamd/Makefile 21 Jan 2014 13:07:26 -0000      1.19
>+++ mail/milter-spamd/Makefile 16 Sep 2014 18:52:09 -0000
>@@ -3,6 +3,7 @@
> COMMENT=      sendmail milter plugin for SpamAssassin spamd
> 
> DISTNAME=     milter-spamd-0.6
>+REVISION=     0
> CATEGORIES=   mail
> MASTER_SITES= http://www.benzedrine.cx/
> 
>@@ -12,7 +13,13 @@ MAINTAINER= Daniel Hartmeier <dhartmei@o
> 
> # BSD
> PERMIT_PACKAGE_CDROM= Yes
>-WANTLIB=              c pthread milter
>+WANTLIB=              c milter pthread
>+
>+LIB_DEPENDS=  mail/sendmail
>+
>+MAKE_FLAGS=   CPPFLAGS="-I${LOCALBASE}/include" \
>+              CFLAGS="-Wall -Wstrict-prototypes ${CFLAGS}" \
>+              LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
> 
> NO_TEST=      Yes
> 
>Index: mail/mimedefang/Makefile
>===================================================================
>RCS file: /cvs/ports/mail/mimedefang/Makefile,v
>retrieving revision 1.37
>diff -u -p -r1.37 Makefile
>--- mail/mimedefang/Makefile   8 Jul 2014 15:55:43 -0000       1.37
>+++ mail/mimedefang/Makefile   16 Sep 2014 18:53:16 -0000
>@@ -3,6 +3,7 @@
> COMMENT=      mailfilter to identify and mark spam
> 
> DISTNAME=     mimedefang-2.75
>+REVISION=     0
> CATEGORIES=   mail
> 
> HOMEPAGE=     http://www.mimedefang.org/
>@@ -21,6 +22,7 @@ RUN_DEPENDS= archivers/p5-Archive-Zip \
>               www/p5-HTML-Parser \
>               sysutils/p5-Unix-Syslog
> BUILD_DEPENDS=        ${RUN_DEPENDS}
>+LIB_DEPENDS=  mail/sendmail
> 
> CONFIGURE_STYLE=gnu
> CONFIGURE_ARGS=       --with-user=_mdefang \
>Index: mail/py-milter/Makefile
>===================================================================
>RCS file: /cvs/ports/mail/py-milter/Makefile,v
>retrieving revision 1.20
>diff -u -p -r1.20 Makefile
>--- mail/py-milter/Makefile    15 Apr 2013 07:44:01 -0000      1.20
>+++ mail/py-milter/Makefile    16 Sep 2014 18:58:10 -0000
>@@ -5,6 +5,7 @@ COMMENT =      Python interface to sendmail m
> MODPY_EGG_VERSION = 0.9.8
> DISTNAME =    pymilter-${MODPY_EGG_VERSION}
> PKGNAME =     ${DISTNAME:S/py/py-/}
>+REVISION =    0
> CATEGORIES =  mail
> 
> HOMEPAGE =    http://www.bmsi.com/python/milter.html
>@@ -18,6 +19,7 @@ MASTER_SITES =       ${MASTER_SITE_SOURCEFORGE
> 
> MODULES =     lang/python
> 
>+LIB_DEPENDS = mail/sendmail
> TEST_DEPENDS = ${RUN_DEPENDS} \
>                 net/py-dns
> 
>Index: mail/smtp-vilter/Makefile
>===================================================================
>RCS file: /cvs/ports/mail/smtp-vilter/Makefile,v
>retrieving revision 1.56
>diff -u -p -r1.56 Makefile
>--- mail/smtp-vilter/Makefile  23 Jan 2014 15:45:18 -0000      1.56
>+++ mail/smtp-vilter/Makefile  16 Sep 2014 18:57:08 -0000
>@@ -3,7 +3,7 @@
> COMMENT=      sendmail milter to scan messages for viruses and spam
> 
> DISTNAME=     smtp-vilter-1.3.6
>-EPOCH=                0
>+EPOCH=                1
> 
> CATEGORIES=           mail
> 
>@@ -18,6 +18,8 @@ WANTLIB += c m pthread milter
> 
> MASTER_SITES=         ${HOMEPAGE}
> EXTRACT_SUFX= .tgz
>+
>+LIB_DEPENDS=  mail/sendmail
> 
> NO_TEST=      Yes
> 
>Index: security/clamav/Makefile
>===================================================================
>RCS file: /cvs/ports/security/clamav/Makefile,v
>retrieving revision 1.92
>diff -u -p -r1.92 Makefile
>--- security/clamav/Makefile   26 Jun 2014 15:36:11 -0000      1.92
>+++ security/clamav/Makefile   16 Sep 2014 19:13:31 -0000
>@@ -2,7 +2,7 @@
> 
> COMMENT=              virus scanner
> DISTNAME=             clamav-0.98.4
>-REVISION=             0
>+REVISION=             1
> 
> CATEGORIES=           security
> 
>@@ -25,6 +25,7 @@ BUILD_DEPENDS=               devel/check \
> 
> LIB_DEPENDS=          archivers/bzip2 \
>                       devel/libtool,-ltdl \
>+                      mail/sendmail \
>                       net/curl \
>                       textproc/libxml
> 

-- 
Sent from a phone, please excuse the formatting.

Reply via email to