From 9d1e2ce03821e28c57359f6e86e1c19a10193894 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Sun, 18 May 2014 18:34:03 +0000 Subject: [PATCH] mail/gmime26 mail/gmime26-sharp: - Remove leading hyphen from PKGNAMESUFFIX. - USES=libtool tar:xz. - Remove LATEST_LINK. - Remove $FreeBSD$ from patch. mail/dbmail: - USES=libtool. - INSTALL_TARGET=install-strip. - Remove -fPIC. - Remove PTHREAD_CFLAGS and PTHREAD_LIBS. --- mail/dbmail/Makefile | 11 +++++------ mail/dbmail/pkg-plist | 8 ++++---- mail/gmime26-sharp/Makefile | 9 +++------ mail/gmime26/Makefile | 12 ++++-------- mail/gmime26/files/patch-docs_Makefile.in | 3 --- mail/gmime26/pkg-plist | 2 +- 6 files changed, 17 insertions(+), 28 deletions(-) diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index 0452fca6c20c..bda4073c955e 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -3,6 +3,7 @@ PORTNAME= dbmail PORTVERSION= 3.1.13 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.dbmail.org/download/3.1/ \ http://git.dbmail.eu/paul/dbmail/snapshot/ @@ -29,16 +30,16 @@ SIEVE_DESC= Sieve mail sorting language support OPTIONS_SUB= yes -USE_AUTOTOOLS= libtool autoheader autoconf +INSTALL_TARGET= install-strip +USE_AUTOTOOLS= autoheader autoconf USE_LDCONFIG= ${PREFIX}/lib/dbmail USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved USE_OPENSSL= yes -USES= gmake shebangfix pkgconfig +USES= gmake libtool pkgconfig shebangfix SHEBANG_FILES= man/fixsp.pl -CFLAGS+= -fPIC ${PTHREAD_CFLAGS} CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc --enable-manpages MAKE_ARGS+= mandir=${MANPREFIX}/man @@ -73,7 +74,5 @@ post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dbmail/libauth_sql.so.0 \ - ${STAGEDIR}${PREFIX}/lib/dbmail/libdbmail.so.0 .include diff --git a/mail/dbmail/pkg-plist b/mail/dbmail/pkg-plist index acc8402a7bf3..334a4e61d2a6 100644 --- a/mail/dbmail/pkg-plist +++ b/mail/dbmail/pkg-plist @@ -1,18 +1,18 @@ @unexec if cmp -s %D/etc/dbmail.conf-dist %D/etc/dbmail.conf; then rm -f %D/etc/dbmail.conf; fi etc/dbmail.conf-dist @exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi -%%LDAP%%lib/dbmail/libauth_ldap.la %%LDAP%%lib/dbmail/libauth_ldap.so %%LDAP%%lib/dbmail/libauth_ldap.so.0 -lib/dbmail/libauth_sql.la +%%LDAP%%lib/dbmail/libauth_ldap.so.0.0.0 lib/dbmail/libauth_sql.so lib/dbmail/libauth_sql.so.0 -lib/dbmail/libdbmail.la +lib/dbmail/libauth_sql.so.0.0.0 lib/dbmail/libdbmail.so lib/dbmail/libdbmail.so.0 -%%SIEVE%%lib/dbmail/libsort_sieve.la +lib/dbmail/libdbmail.so.0.0.0 %%SIEVE%%lib/dbmail/libsort_sieve.so %%SIEVE%%lib/dbmail/libsort_sieve.so.0 +%%SIEVE%%lib/dbmail/libsort_sieve.so.0.0.0 man/man1/dbmail-deliver.1.gz man/man1/dbmail.1.gz man/man5/dbmail.conf.5.gz diff --git a/mail/gmime26-sharp/Makefile b/mail/gmime26-sharp/Makefile index 611b0ac8458b..6702dafecbbb 100644 --- a/mail/gmime26-sharp/Makefile +++ b/mail/gmime26-sharp/Makefile @@ -1,14 +1,14 @@ # Created by: Tom McLaughlin # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail -PKGNAMESUFFIX= -26-sharp +PKGNAMESUFFIX= 26-sharp MAINTAINER= mono@FreeBSD.org COMMENT= Mono bindings for gmime -LIB_DEPENDS= gmime-2.6:${PORTSDIR}/mail/gmime26 +LIB_DEPENDS= libgmime-2.6.so:${PORTSDIR}/mail/gmime26 MASTERDIR= ${.CURDIR}/../gmime26 BUILD_WRKSRC= ${WRKSRC}/mono @@ -19,13 +19,10 @@ PLIST= ${.CURDIR}/pkg-plist USE_GNOME+= gtksharp20 CONFIGURE_ARGS= --enable-mono=yes -LATEST_LINK= gmime26-sharp - # Else we conflict with mail/gmime26 OPTIONS_EXCLUDE= DOCS # Done in pre-configure because master port has a post-patch target already. -NO_STAGE= yes pre-configure: @${REINPLACE_CMD} -e 's|.@GMIME_VERSION@||g' \ ${WRKSRC}/mono/gmime-sharp.dll.config.in diff --git a/mail/gmime26/Makefile b/mail/gmime26/Makefile index e87bcdb096a7..b4facd8d2cef 100644 --- a/mail/gmime26/Makefile +++ b/mail/gmime26/Makefile @@ -3,10 +3,10 @@ PORTNAME= gmime PORTVERSION= 2.6.18 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= mail MASTER_SITES= GNOME -PKGNAMESUFFIX?= -26 +PKGNAMESUFFIX?= 26 MAINTAINER?= ahicks@p-o.co.uk COMMENT?= Library (written in C) for parsing and creating messages using MIME @@ -16,11 +16,9 @@ LICENSE= LGPL21 SLAVEDIRS= mail/gmime26-sharp DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}26 -USE_AUTOTOOLS= libtool -USE_GNOME+= glib20 ltverhack -USES= gmake pathfix pkgconfig iconv +USES= gmake iconv libtool pathfix pkgconfig tar:xz +USE_GNOME+= glib20 USE_LDCONFIG= yes -USE_XZ= yes GNU_CONFIGURE= yes # www.freebsd.org/cgi/query-pr.cgi?pr=118092 # Rename uudecode and uuencode to gmime-* to not conflict with userland @@ -31,8 +29,6 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -LATEST_LINK?= ${PORTNAME}26 - OPTIONS_DEFINE= DOCS .include diff --git a/mail/gmime26/files/patch-docs_Makefile.in b/mail/gmime26/files/patch-docs_Makefile.in index d0cc6906ca1a..58d60ad4e11e 100644 --- a/mail/gmime26/files/patch-docs_Makefile.in +++ b/mail/gmime26/files/patch-docs_Makefile.in @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- docs/Makefile.in.orig +++ docs/Makefile.in @@ -201,7 +201,7 @@ diff --git a/mail/gmime26/pkg-plist b/mail/gmime26/pkg-plist index 3d03d544504f..918635366eac 100644 --- a/mail/gmime26/pkg-plist +++ b/mail/gmime26/pkg-plist @@ -52,9 +52,9 @@ include/gmime-2.6/gmime/gmime-version.h include/gmime-2.6/gmime/gmime.h include/gmime-2.6/gmime/internet-address.h lib/libgmime-2.6.a -lib/libgmime-2.6.la lib/libgmime-2.6.so lib/libgmime-2.6.so.0 +lib/libgmime-2.6.so.0.618.0 libdata/pkgconfig/gmime-2.6.pc @dirrm include/gmime-2.6/gmime @dirrm include/gmime-2.6