- 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
This commit is contained in:
Dirk Meyer 2007-06-02 14:46:41 +00:00
parent 62c62228ac
commit 3abbac1d8a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=192585
9 changed files with 84 additions and 45 deletions

View file

@ -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/libmilter.a:${PORTSDIR}/mail/${SENDMAIL_MILTER_
.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}

View file

@ -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

View file

@ -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

View file

@ -1,11 +0,0 @@
--- dk-filter/Makefile.m4.bak Fri Apr 8 21:50:08 2005
+++ dk-filter/Makefile.m4 Sun May 22 13:07:23 2005
@@ -10,7 +10,7 @@
dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ')
dnl To use the asynchronous resolver library provided, enable this line:
-dnl bldPUSH_SMLIB(`ar')
+bldPUSH_SMLIB(`ar')
bldPUSH_SMLIB(`dk')
APPENDDEF(`confINCDIRS', `-I../libdk/ ')

View file

@ -1,10 +0,0 @@
--- libar/Makefile.m4.orig Sun Sep 17 01:00:43 2006
+++ libar/Makefile.m4 Wed Apr 11 16:24:39 2007
@@ -12,7 +12,6 @@
bldPRODUCT_START(`library', `libar')
define(`bldSOURCES', `ar.c manual.c ')
-define(`bldINSTALLABLE', `true')
bldPRODUCT_END
bldPRODUCT_START(`manpage', `ar')

View file

@ -1,15 +0,0 @@
--- libdk/Makefile.m4.bak Sat Sep 4 00:39:01 2004
+++ libdk/Makefile.m4 Sun May 22 13:10:14 2005
@@ -4,9 +4,9 @@
define(`confREQUIRE_LIBSM', `true')
dnl Enable these lines to make use of the provided asynchronous resolver:
-dnl bldPUSH_SMLIB(`ar')
-dnl APPENDDEF(`confENVDEF', `-DUSE_ARLIB ')
-dnl APPENDDEF(`confINCDIRS', `-I../libar/ ')
+bldPUSH_SMLIB(`ar')
+APPENDDEF(`confENVDEF', `-DUSE_ARLIB ')
+APPENDDEF(`confINCDIRS', `-I../libar/ ')
dnl Enable and edit this as appropriate for your system:
dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')

View file

@ -4,3 +4,9 @@ define(`confMANROOTMAN',`%%PREFIX%%/man/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%% ')

View file

@ -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')

View file

@ -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%%