aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjgh <jgh@FreeBSD.org>2012-03-06 02:45:29 +0800
committerjgh <jgh@FreeBSD.org>2012-03-06 02:45:29 +0800
commit2f371d2929ae929371b738beba94bd4548609ad0 (patch)
tree1792e241c6bfe645160af5013415e52df25dd878
parent37d487453e5be15c2ccfa34e4d64b4e7ad9e263d (diff)
downloadfreebsd-ports-gnome-2f371d2929ae929371b738beba94bd4548609ad0.tar.gz
freebsd-ports-gnome-2f371d2929ae929371b738beba94bd4548609ad0.tar.zst
freebsd-ports-gnome-2f371d2929ae929371b738beba94bd4548609ad0.zip
- Update to 2.5.0.1
- stylistic maintainer fixes PR: ports/165601 Submitted by: maintainer, umq@ueo.co.jp
-rw-r--r--mail/opendkim/Makefile28
-rw-r--r--mail/opendkim/distinfo4
-rw-r--r--mail/opendkim/files/patch-libopendkim_tests_t-test75.c32
3 files changed, 17 insertions, 47 deletions
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index ee2ad9e4c387..105ff201f846 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -5,25 +5,27 @@
# $FreeBSD$
#
-PORTNAME= opendkim
-PORTVERSION= 2.5.0
-CATEGORIES= mail security
-MASTER_SITES= SF
+PORTNAME= opendkim
+PORTVERSION= 2.5.0.1
+CATEGORIES= mail security
+MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME} \
${PORTNAME}/Previous%20Releases
-MAINTAINER= umq@ueo.co.jp
-COMMENT= DKIM library and milter implementation
+MAINTAINER= umq@ueo.co.jp
+COMMENT= DKIM library and milter implementation
-LICENSE= BSD SENDMAIL
-LICENSE_COMB= multi
-LICENSE_FILE= ${WRKSRC}/LICENSE
+LICENSE= BSD SENDMAIL
+LICENSE_COMB= multi
+LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_FILE_SENDMAIL= ${WRKSRC}/LICENSE.Sendmail
LICENSE_GROUPS_SENDMAIL= FSF OSI
LICENSE_NAME_SENDMAIL= Sendmail Open Source License
LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1$$//}
+
GNU_CONFIGURE= yes
USE_OPENSSL= yes
USE_LDCONFIG= yes
@@ -48,9 +50,9 @@ MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
.include <bsd.port.pre.mk>
.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER)
-USE_RC_SUBR= milter-opendkim
-MAN5+= opendkim.conf.5
-MAN8+= opendkim.8
+USE_RC_SUBR= milter-opendkim
+MAN5+= opendkim.conf.5
+MAN8+= opendkim.8
PLIST_SUB+= FILTER=""
SUB_FILES= pkg-message
WITHOUT_MILTER_CFLAGS= yes
@@ -63,7 +65,7 @@ PLIST_SUB+= FILTER="@comment "
.endif
.if defined(WITH_GNUTLS)
-LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE}
.else
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index ac517313c8f2..a1e91b48a2fe 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendkim-2.5.0.tar.gz) = 5c17a5c82936495b35bc12b32438ebd7b7a624e3389fcac672f7d2ec5bdc8981
-SIZE (opendkim-2.5.0.tar.gz) = 1465356
+SHA256 (opendkim-2.5.0.1.tar.gz) = a1423fbd7b28fddee3cc51ffe550393cca44c32ac049c867ff86e984b787eeb6
+SIZE (opendkim-2.5.0.1.tar.gz) = 1465386
diff --git a/mail/opendkim/files/patch-libopendkim_tests_t-test75.c b/mail/opendkim/files/patch-libopendkim_tests_t-test75.c
deleted file mode 100644
index ec5e6c3e583b..000000000000
--- a/mail/opendkim/files/patch-libopendkim_tests_t-test75.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./libopendkim/tests/t-test75.c.orig 2012-03-01 08:52:30.000000000 +0900
-+++ ./libopendkim/tests/t-test75.c 2012-03-01 15:50:21.000000000 +0900
-@@ -52,6 +52,14 @@
- dkim_query_t qtype = DKIM_QUERY_FILE;
- unsigned char hdr[MAXHEADER + 1];
-
-+#ifdef USE_GNUTLS
-+ (void) gnutls_global_init();
-+#endif /* USE_GNUTLS */
-+
-+ /* instantiate the library */
-+ lib = dkim_init(NULL, NULL);
-+ assert(lib != NULL);
-+
- if (!dkim_libfeature(lib, DKIM_FEATURE_PARSE_TIME))
- {
- printf("*** Date: value extraction SKIPPED\n");
-@@ -62,14 +70,6 @@
- printf("*** Date: value extraction\n");
- }
-
--#ifdef USE_GNUTLS
-- (void) gnutls_global_init();
--#endif /* USE_GNUTLS */
--
-- /* instantiate the library */
-- lib = dkim_init(NULL, NULL);
-- assert(lib != NULL);
--
- #ifdef TEST_KEEP_FILES
- /* set flags */
- flags = (DKIM_LIBFLAGS_TMPFILES|DKIM_LIBFLAGS_KEEPFILES);