From umq@ueo.co.jp  Sat Jun  2 01:18:16 2007
Return-Path: <umq@ueo.co.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5266C16A485
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  2 Jun 2007 01:18:16 +0000 (UTC)
	(envelope-from umq@ueo.co.jp)
Received: from msa4-25.plala.or.jp (msa4.plala.or.jp [58.93.251.204])
	by mx1.freebsd.org (Postfix) with ESMTP id B26DA13C483
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  2 Jun 2007 01:18:14 +0000 (UTC)
	(envelope-from umq@ueo.co.jp)
Received: from eupheme.kaumoge.org ([121.112.76.77]) by msa4-25.plala.or.jp
          with ESMTP
          id <20070602011813.EAIN16510.msa4-25.plala.or.jp@eupheme.kaumoge.org>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Sat, 2 Jun 2007 10:18:13 +0900
Received: from calliope.kaumoge.org (calliope.kaumoge.org [192.168.24.120])
	by eupheme.kaumoge.org (8.12.11/8.12.11/20030713) with ESMTP id l521IZS4012644
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 2 Jun 2007 10:18:35 +0900 (JST)
	(envelope-from umq@ueo.co.jp)
Message-Id: <861wgvupbe.wl%umq@ueo.co.jp>
Date: Sat, 02 Jun 2007 10:18:13 +0900
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] mail/dk-milter update to 0.6.0
X-Send-Pr-Version: 3.113

>Number:         113242
>Category:       ports
>Synopsis:       [patch] mail/dk-milter update to 0.6.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 02 01:20:03 GMT 2007
>Closed-Date:    Sat Jun 02 17:50:17 CEST 2007
>Last-Modified:  Sat Jun 02 17:50:17 CEST 2007
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 7.0-CURRENT FreeBSD 7.0-CURRENT #8: Mon May 28 02:37:30 JST 2007 root@calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64

>Description:
	The new version of dk-milter 0.6.0 has been released.
	Release notes: http://sourceforge.net/project/shownotes.php?release_id=512617

>How-To-Repeat:
	N/A
>Fix:

	The patch follows.

	deleted:
	 files/patch-dk-filter-Makefile.m4
	 files/patch-libar-Makefile.m4
	 files/patch-libdk-Makefile.m4
	added:
	 Makefile.features


cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dk-milter/Makefile,v
retrieving revision 1.23
diff -p -u -r1.23 Makefile
--- Makefile	13 Apr 2007 04:14:39 -0000	1.23
+++ Makefile	2 Jun 2007 01:17:06 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dk-milter
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dk-milter
@@ -15,6 +15,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Domainkeys milter for Sendmail
 
 USE_RC_SUBR=	milter-dk.sh
+USE_OPENSSL=	yes
 
 IPCCHECK!=	ipcrm -q 0 2>&1 || true
 .if ${IPCCHECK:Mimplemented}
@@ -40,21 +41,58 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilt
 .endif
 .endif
 
+.if defined(WITH_SENDMAIL_STATIC_MILTER) || !defined(SENDMAIL_WITH_SHARED_MILTER)
+SITE+=		-e '\|-static|s|%%STATIC%%||g'
+.else
+SITE+=		-e '\|-static|s|%%STATIC%%|dnl |g'
+.endif
+
 SENDMAIL_MILTER_PORT?=	sendmail
 WCONF=		${WRKSRC}/devtools/Site
 MAN8=		dk-filter.8
 DOCSFILES=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
-		dk-filter/autorespond.csh
+		rfc4870.txt dk-filter/autorespond.csh
 
 SITE+=		${FILESDIR}/site.config.m4
 .if !defined(SENDMAIL_MILTER_IN_BASE)
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif
+SITE+=		${WRKSRC}/site.config.m4.dist
+SITE_SUB+=	-e "s|%%PREFIX%%|${PREFIX}|g" \
+		-e "s|%%LOCALBASE%%|${LOCALBASE}|g"
 
 .include <bsd.port.pre.mk>
 
 SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"
 
+.if defined(WITH_DEBUG)
+SITE_SUB+=	-e '\|confOPTIMIZE.*-g|s/^dnl //g'
+.endif
+.if !defined(WITHOUT_ARLIB)
+SITE_SUB+=	-e '\|bld_USE_ARLIB|s/^dnl //g'
+.endif
+.if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH)
+SITE_SUB+=	-e '/-DPOPAUTH/s/^dnl //g'
+.endif
+
+.if defined(WITH_POPAUTH)
+USE_BDB=	41+
+INVALID_BDB_VER=	2 3 40
+SITE_SUB+=	-e 's|%%BDB%%||g' \
+		-e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \
+		-e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \
+		-e "s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g"
+.else
+SITE_SUB+=	-e 's|%%BDB%%|dnl |g'
+.endif
+.if defined(WITH_OPENSSL_BASE) || defined(OPENSSL_OVERWRITE_BASE)
+SITE_SUB+=	-e 's|%%OPENSSL%%|dnl |g'
+.else
+SITE_SUB+=	-e 's|%%OPENSSL%%||g' \
+		-e "s|%%OPENSSLINC%%|${OPENSSLINC}|g" \
+		-e "s|%%OPENSSLLIB%%|${OPENSSLLIB}|g"
+.endif
+
 .if defined(SENDMAIL_WITHOUT_MILTER)
 pre-fetch:
 	@${ECHO_MSG}
@@ -63,18 +101,20 @@ pre-fetch:
 	@${FALSE}
 .endif
 
+.include	"${.CURDIR}/Makefile.features"
 pre-configure:
 	${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \
 		-e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e "s|\`-O'|\`${CFLAGS}'|g" \
 		${WRKSRC}/devtools/OS/FreeBSD
-	${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
-		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+	${SED} ${SITE_SUB} -e '\|^dnl |d' -e '/^dnl$$/d' \
 		${SITE} > ${WCONF}/site.config.m4
 
 post-install:
+.if !defined(WITH_DEBUG)
 	-${STRIP_CMD} ${PREFIX}/libexec/dk-filter
+.endif
 	${INSTALL_SCRIPT} ${WRKSRC}/dk-filter/gentxt.csh \
 		${PREFIX}/sbin/gentxt-dk
 .for i in ${MAN8}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/dk-milter/distinfo,v
retrieving revision 1.8
diff -p -u -r1.8 distinfo
--- distinfo	13 Apr 2007 04:14:39 -0000	1.8
+++ distinfo	2 Jun 2007 01:17:06 -0000
@@ -1,3 +1,3 @@
-MD5 (dk-milter-0.5.0.tar.gz) = 3451cfe6460fb90d836cda5afbcea908
-SHA256 (dk-milter-0.5.0.tar.gz) = 91f87e121a078e13b5babe6df4f68bc05b44f814c5b646311eedd5c650deed31
-SIZE (dk-milter-0.5.0.tar.gz) = 347434
+MD5 (dk-milter-0.6.0.tar.gz) = f0fb37e503d34d13893c259867463dd8
+SHA256 (dk-milter-0.6.0.tar.gz) = 1114e9e548a341eda66da92fcca903d665e77763ee63d67e690606af4acce683
+SIZE (dk-milter-0.6.0.tar.gz) = 350417
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/dk-milter/pkg-plist,v
retrieving revision 1.3
diff -p -u -r1.3 pkg-plist
--- pkg-plist	7 Nov 2006 20:20:10 -0000	1.3
+++ pkg-plist	2 Jun 2007 01:17:06 -0000
@@ -7,4 +7,5 @@ sbin/gentxt-dk
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/autorespond.csh
+%%PORTDOCS%%%%DOCSDIR%%/rfc4870.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
cvs diff: Diffing files
Index: files/site.config.m4
===================================================================
RCS file: /home/ncvs/ports/mail/dk-milter/files/site.config.m4,v
retrieving revision 1.1
diff -p -u -r1.1 site.config.m4
--- files/site.config.m4	22 May 2005 13:39:11 -0000	1.1
+++ files/site.config.m4	2 Jun 2007 01:17:06 -0000
@@ -4,3 +4,9 @@ define(`confMANROOTMAN',`%%PREFIX%%/man/
 define(`confUBINDIR',`%%PREFIX%%/libexec')
 define(`confLIBDIR',`%%PREFIX%%/lib')
 define(`confDONT_INSTALL_CATMAN',`True')
+%%STATIC%%APPENDDEF(`confLIBS', `-static ')
+%%BDB%%APPENDDEF(`confLIBDIRS', `-L%%BDB_LIB_DIR%% ')
+%%BDB%%APPENDDEF(`confINCDIRS', `-I%%BDB_INCLUDE_DIR%% ')
+%%BDB%%APPENDDEF(`confLIBS', `-l%%BDB_LIB_NAME%% ')
+%%OPENSSL%%APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%% ')
+%%OPENSSL%%APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%% ')
Index: files/site.config.m4.milter
===================================================================
RCS file: /home/ncvs/ports/mail/dk-milter/files/site.config.m4.milter,v
retrieving revision 1.1
diff -p -u -r1.1 site.config.m4.milter
--- files/site.config.m4.milter	22 May 2005 13:39:11 -0000	1.1
+++ files/site.config.m4.milter	2 Jun 2007 01:17:06 -0000
@@ -1,2 +1,2 @@
-APPENDDEF(`confENVDEF',`-I%%LOCALBASE%%/include')
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
+APPENDDEF(`bld_dk_filter_INCDIRS',`-I%%LOCALBASE%%/include')
+APPENDDEF(`bld_dk_filter_LIBDIRS', `-L%%LOCALBASE%%/lib')
diff --exclude work --exclude CVS -Npru ports.orig/mail/dk-milter/Makefile.features ports/mail/dk-milter/Makefile.features
--- ports.orig/mail/dk-milter/Makefile.features	Thu Jan  1 09:00:00 1970
+++ ports/mail/dk-milter/Makefile.features	Sat Jun  2 09:57:05 2007
@@ -0,0 +1,28 @@
+# Makefile.features
+# Author:			Hirohisa Yamaguchi <umq@ueo.co.jp>
+#
+# This file is used to tune build time options.
+# Please refer FEATURES file distributed with the source for details.
+#
+# $FreeBSD$
+#
+
+.if defined(WITH_ANTICIPATE_SENDMAIL_MUNGE) && !defined(WITHOUT_ANTICIPATE_SENDMAIL_MUNGE)
+SITE_SUB+=	-e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||'
+.endif
+
+.if defined(WITH_FLUSH_HEADERS) && !defined(WITHOUT_FLUSH_HEADERS)
+SITE_SUB+=	-e '/-D_FFR_FLUSH_HEADERS/s|^dnl ||'
+.endif
+
+.if defined(WITH_MULTIPLE_KEYS) && !defined(WITHOUT_MULTIPLE_KEYS)
+SITE_SUB+=	-e '/-D_FFR_MULTIPLE_KEYS/s|^dnl ||'
+.endif
+
+.if defined(WITH_REQUIRED_HEADERS) && !defined(WITHOUT_REQUIRED_HEADERS)
+SITE_SUB+=	-e '/-D_FFR_REQUIRED_HEADERS/s|^dnl ||'
+.endif
+
+.if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
+SITE_SUB+=	-e '/-D_FFR_SELECT_CANONICALIZATION/s|^dnl ||'
+.endif
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jun 2 01:20:10 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113242 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113242: commit references a PR
Date: Sat,  2 Jun 2007 14:46:47 +0000 (UTC)

 dinoex      2007-06-02 14:46:41 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/dk-milter       Makefile distinfo pkg-plist 
     mail/dk-milter/files site.config.m4 site.config.m4.milter 
   Added files:
     mail/dk-milter       Makefile.features 
   Removed files:
     mail/dk-milter/files patch-dk-filter-Makefile.m4 
                          patch-libar-Makefile.m4 
                          patch-libdk-Makefile.m4 
   Log:
   - update to 0.6.0
   - new options: WITH_DEBUG, WITHOUT_ARLIB, WITH_POPAUTH
   - new features: WITH_ANTICIPATE_SENDMAIL_MUNGE, WITH_FLUSH_HEADERS,
                   WITH_MULTIPLE_KEYS, WITH_REQUIRED_HEADERS,
                   WITH_SELECT_CANONICALIZATION
   
   PR:             113242
   Submitted by:   Hirohisa Yamaguchi
   
   Revision  Changes    Path
   1.24      +44 -4     ports/mail/dk-milter/Makefile
   1.1       +28 -0     ports/mail/dk-milter/Makefile.features (new)
   1.9       +3 -3      ports/mail/dk-milter/distinfo
   1.2       +0 -11     ports/mail/dk-milter/files/patch-dk-filter-Makefile.m4 (dead)
   1.4       +0 -10     ports/mail/dk-milter/files/patch-libar-Makefile.m4 (dead)
   1.2       +0 -15     ports/mail/dk-milter/files/patch-libdk-Makefile.m4 (dead)
   1.2       +6 -0      ports/mail/dk-milter/files/site.config.m4
   1.2       +2 -2      ports/mail/dk-milter/files/site.config.m4.milter
   1.4       +1 -0      ports/mail/dk-milter/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: dinoex 
State-Changed-When: Sat Jun 2 17:50:04 CEST 2007 
State-Changed-Why:  
committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113242 
>Unformatted:
