Attachment 78766 Details for Bug 113242 – file.diff

[patch] file.diff

file.diff (text/plain), 6.73 KB, created by Hirohisa Yamaguchi on 2007-06-02 02:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hirohisa Yamaguchi

Created: 2007-06-02 02:20:03 UTC

Size: 6.73 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 113242: 78766