diff options
29 files changed, 43 insertions, 83 deletions
diff --git a/mail/antivirus-milter/Makefile b/mail/antivirus-milter/Makefile index eaf4802..ebd92ba 100644 --- a/mail/antivirus-milter/Makefile +++ b/mail/antivirus-milter/Makefile @@ -12,8 +12,8 @@ COMMENT= Sendmail milter wich uses McAfee Virus Scan or clamav LICENSE= BSD2CLAUSE -CFLAGS+= -Wall ${PTHREAD_CFLAGS:S=""==} -LIBS+= -lmilter ${PTHREAD_LIBS} +CFLAGS+= -Wall +LIBS+= -lmilter -lpthread PLIST_SUB+= ANTIVIRUS=${ANTIVIRUS_DIR} SUB_LIST+= ANTIVIRUS=${ANTIVIRUS_DIR} SED_SCRIPT= -e 's|%%ANTIVIRUS%%|${ANTIVIRUS_DIR}|g' \ diff --git a/mail/archivesmtp/Makefile b/mail/archivesmtp/Makefile index cd1ace8..cc4718c 100644 --- a/mail/archivesmtp/Makefile +++ b/mail/archivesmtp/Makefile @@ -6,12 +6,10 @@ PORTVERSION= 1.2 CATEGORIES= mail MASTER_SITES= http://www.dancingfortune.com/projects/archivesmtp/files/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= SMTP mail archiver -CFLAGS+= ${PTHREAD_CFLAGS} -LIBS+= ${PTHREAD_LIBS}\ - -lmilter +LIBS+= -lmilter -lpthread MAKE_ENV+= LDADD="${LIBS}" USE_RC_SUBR= archivesmtp diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 883989a..615f537 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -62,8 +62,8 @@ LISTEXT_DESC= Enable IMAP List extensions LISTEXT_CONFIGURE_ENABLE=listext MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder -MURDER_CFLAGS= ${PTHREAD_CFLAGS} -MURDER_MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} +MURDER_CFLAGS= +MURDER_MAKE_ENV= PTHREAD_LIBS="-lpthread" MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ON= --with-mysql=yes \ --with-mysql-libdir=${LOCALBASE}/lib/mysql \ @@ -184,8 +184,6 @@ post-patch: @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec - @${REINPLACE_CMD} -e "s|-lpthread|\$$(PTHREAD_LIBS)|g" \ - ${WRKSRC}/imap/Makefile.in @${SED} -e "s|%%PREFIX%%|${PREFIX}|g;" \ ${FILESDIR}/cyrus-imapd-man.conf \ > ${WRKDIR}/cyrus-imapd-man.conf diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 95b8e0a..caf7909 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -59,8 +59,8 @@ LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder -MURDER_CFLAGS= ${PTHREAD_CFLAGS} -MURDER_MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} +MURDER_CFLAGS= +MURDER_MAKE_ENV= PTHREAD_LIBS="-lpthread" MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ON= --with-mysql=yes \ --with-mysql-libdir=${LOCALBASE}/lib/mysql \ @@ -183,8 +183,6 @@ post-patch: @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec - @${REINPLACE_CMD} -e "s|-lpthread|\$$(PTHREAD_LIBS)|g" \ - ${WRKSRC}/imap/Makefile.in @${SED} -e "s|%%PREFIX%%|${PREFIX}|g;" \ ${FILESDIR}/cyrus-imapd-man.conf \ > ${WRKDIR}/cyrus-imapd-man.conf diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile index 2c8b647..74670ff 100644 --- a/mail/cyrus-imapd25/Makefile +++ b/mail/cyrus-imapd25/Makefile @@ -70,8 +70,8 @@ LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder -MURDER_CFLAGS= ${PTHREAD_CFLAGS} -MURDER_MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} +MURDER_CFLAGS= +MURDER_MAKE_ENV= PTHREAD_LIBS="-lpthread" MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ON= --with-mysql=yes \ --with-mysql-libdir=${LOCALBASE}/lib/mysql \ diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index dd931ea..1db21a2 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -95,9 +95,7 @@ SITE_SUB+= -e 's|%%OPENSSL%%||g' \ .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' \ + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e "s|\`-O'|\`${CFLAGS}'|g" \ ${WRKSRC}/devtools/OS/FreeBSD ${SED} ${SITE_SUB} -e '\|^dnl |d' -e '/^dnl$$/d' \ diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile index d7e46d0..bb1ffef 100644 --- a/mail/esmtp/Makefile +++ b/mail/esmtp/Makefile @@ -24,8 +24,8 @@ PLIST_FILES= bin/esmtp etc/esmtprc.sample man/man1/esmtp.1.gz \ SUB_FILES= pkg-message -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS diff --git a/mail/exim/Makefile b/mail/exim/Makefile index fce6a7a..8c122f1 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -447,7 +447,7 @@ SEDLIST+= -e 's,^(ALT_CONFIG_PREFIX=),\# \1,' .if ${PORT_OPTIONS:MSPF} SEDLIST+= -e 's,XX_SPF_FLAGS_XX,-DSPF,' \ - -e 's,XX_SPF_LIBS_XX,-L${LOCALBASE}/lib -lspf2 ${PTHREAD_LIBS:S/,/\\,/g},' \ + -e 's,XX_SPF_LIBS_XX,-L${LOCALBASE}/lib -lspf2 -lpthread,' \ -e 's,^\# (EXPERIMENTAL_SPF=),\1,' .else SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ diff --git a/mail/milter-bogom/Makefile b/mail/milter-bogom/Makefile index f391e23..0d97a75 100644 --- a/mail/milter-bogom/Makefile +++ b/mail/milter-bogom/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= libmilter.so:${PORTSDIR}/mail/sendmail LDFLAGS+= -I${LOCALBASE}/include .endif -MAKE_ARGS= CPPFLAGS="-DDEF_CONF=\\\"${PREFIX}/etc/bogom.conf\\\" ${PTHREAD_CFLAGS}" \ - LIBS="-lmilter ${PTHREAD_LIBS}" LDFLAGS="${LDFLAGS}" +MAKE_ARGS= CPPFLAGS="-DDEF_CONF=\\\"${PREFIX}/etc/bogom.conf\\\"" \ + LIBS="-lmilter -lpthread" LDFLAGS="${LDFLAGS}" USE_RC_SUBR= milter-bogom SUB_FILES= pkg-message diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile index ca57221..0ecaaf4 100644 --- a/mail/milter-greylist-devel/Makefile +++ b/mail/milter-greylist-devel/Makefile @@ -76,8 +76,7 @@ LDFLAGS+= ${SENDMAIL_LDFLAGS} LIBS+= ${SENDMAIL_LDADD} .endif -CFLAGS+= ${PTHREAD_CFLAGS} -LIBS+= ${PTHREAD_LIBS} +LIBS+= -lpthread GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-user=mailnull \ diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index 10567ed..3813ce0 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -69,8 +69,7 @@ LDFLAGS+= ${SENDMAIL_LDFLAGS} LIBS+= ${SENDMAIL_LDADD} .endif -CFLAGS+= ${PTHREAD_CFLAGS} -LIBS+= ${PTHREAD_LIBS} +LIBS+= -lpthread GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-user=mailnull \ diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile index c49299b..1da3979 100644 --- a/mail/milter-regex/Makefile +++ b/mail/milter-regex/Makefile @@ -33,8 +33,7 @@ post-patch: "s:/etc/milter-regex.conf:${PREFIX}/etc/milter-regex.conf:g; \ s:/var/spool/milter-regex:${SPOOLDIR}:g; \ s:mailstats 1:mailstats 8:;" ${WRKSRC}/milter-regex.8 - ${REINPLACE_CMD} -e "s:-lpthread:${PTHREAD_LIBS}:g; \ - s:-I/usr/src/gnu/usr.sbin/sendmail/include:${PTHREAD_CFLAGS}:g; \ + ${REINPLACE_CMD} -e "s:-I/usr/src/gnu/usr.sbin/sendmail/include::g; \ s:-L/usr/local/lib:-L${LOCALBASE}/lib:g; \ s/-Werror//g" ${WRKSRC}/Makefile diff --git a/mail/milter-skem/Makefile b/mail/milter-skem/Makefile index 53e3e5c..163fcb6 100644 --- a/mail/milter-skem/Makefile +++ b/mail/milter-skem/Makefile @@ -38,12 +38,7 @@ BROKEN= Does not compile on powerpc EXTRA_PATCHES= files/timet.patch .endif -.if defined(PTHREAD_LIBS) -MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" -.endif -.if defined(PTHREAD_CFLAGS) -MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" -.endif +MAKE_ENV+= PTHREAD_LIBS="-lpthread" .for o in ${PORT_OPTIONS:MSKEM_*} . if ${PORT_OPTIONS:M$o} diff --git a/mail/missey/Makefile b/mail/missey/Makefile index 0faa865..9b802376 100644 --- a/mail/missey/Makefile +++ b/mail/missey/Makefile @@ -14,9 +14,8 @@ COMMENT= Secure small and high performance POP3 server USES= tar:bzip2 -MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" MKDIR="${MKDIR}" WRKSRC="${WRKSRC}" +MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" WRKSRC="${WRKSRC}" \ + INSTALL_DATA="${INSTALL_DATA}" MKDIR="${MKDIR}" PLIST_FILES= sbin/bent sbin/mps etc/mps/pop3d.conf-dist diff --git a/mail/missey/files/Makefile b/mail/missey/files/Makefile index a2c8172..9c81244 100644 --- a/mail/missey/files/Makefile +++ b/mail/missey/files/Makefile @@ -15,7 +15,7 @@ all: $(MPS) $(BENT) $(MPS): $(OBJS_M) $(CC) ${CFLAGS} -o $(MPS) $(OBJS_M) $(LDFLAGS) $(BENT): $(OBJS_B) - $(CC) ${CFLAGS} ${PTHREAD_CFLAGS} -o $(BENT) $(SRCS_B) ${PTHREAD_LIBS} + $(CC) ${CFLAGS} -o $(BENT) $(SRCS_B) -lpthread install: @${MKDIR} -p $(DESTDIR)$(PREFIX)/etc/mps/ ${INSTALL_DATA} $(WRKSRC)/pop3d.conf $(DESTDIR)$(PREFIX)/etc/mps/pop3d.conf-dist diff --git a/mail/noattach/Makefile b/mail/noattach/Makefile index 23a5c5b..53acba1 100644 --- a/mail/noattach/Makefile +++ b/mail/noattach/Makefile @@ -11,7 +11,6 @@ COMMENT= Attachment filter for Sendmail Milter GNU_CONFIGURE= yes USE_RC_SUBR= noattach -CFLAGS+= ${PTHREAD_CFLAGS:S=""==} DOCSFILES= AUTHORS THANKS INSTALL NEWS README TODO ChangeLog SAMPLEFILES= README noattach.patterns noattach.patterns.johncon @@ -26,10 +25,6 @@ CONFIGURE_ENV+= MILTER_INCLUDES="${MILTERINC}" MAKE_ENV+= MILTER_INCLUDES="${MILTERINC}" .endif -pre-configure: - ${REINPLACE_CMD} -e 's=-pthread=${PTHREAD_LIBS}=' \ - ${WRKSRC}/configure - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/noattach ${STAGEDIR}${PREFIX}/libexec/noattach ${INSTALL_MAN} ${WRKSRC}/noattach.8 ${STAGEDIR}${PREFIX}/man/man8/ diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile index ae62553..587e1b0 100644 --- a/mail/p5-MIME-Fast/Makefile +++ b/mail/p5-MIME-Fast/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure -CONFIGURE_ENV= PREFIX="${PREFIX}" CCFLAGS="${CCFLAGS} ${PTHREAD_CFLAGS}" +CONFIGURE_ENV= PREFIX="${PREFIX}" CCFLAGS="${CCFLAGS}" .include <bsd.port.pre.mk> diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile index 655b1f9..85543a3 100644 --- a/mail/proxsmtp/Makefile +++ b/mail/proxsmtp/Makefile @@ -33,7 +33,7 @@ post-patch: -e 's|250-smtp.passthru|${PROXSMTP_SMTP_EHLO_RSP}|g' \ ${WRKSRC}/common/smtppass.c @${REINPLACE_CMD} -e \ - '/^acx_pthread_flags/s|=.*|="${PTHREAD_LIBS}"|' \ + '/^acx_pthread_flags/s|=.*|="-lpthread"|' \ ${WRKSRC}/configure post-install: diff --git a/mail/raysfilter/Makefile b/mail/raysfilter/Makefile index 6035d10..0d4d53f 100644 --- a/mail/raysfilter/Makefile +++ b/mail/raysfilter/Makefile @@ -12,8 +12,8 @@ COMMENT= Configurable filter for Sendmail Milter USES= shebangfix CTARGETS+= rays-filter -CFLAGS+= -Wall ${PTHREAD_CFLAGS:S=""==} -LIBS+= ${PTHREAD_LIBS} +CFLAGS+= -Wall +LIBS+= -lpthread SHEBANG_FILES= mf-analyze ETCFILES= header-list.conf mail-filter.conf string-list.conf BINFILES= mf-reset mf-start mf-stop mf-archive mf-analyze mf-memory diff --git a/mail/rbl-milter/Makefile b/mail/rbl-milter/Makefile index 33ebb11..1d1c2d1 100644 --- a/mail/rbl-milter/Makefile +++ b/mail/rbl-milter/Makefile @@ -12,21 +12,12 @@ COMMENT= Milter that adds mail header warnings on mail from open-relays USES= gmake GNU_CONFIGURE= yes -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" USE_RC_SUBR= rblmilter PLIST_FILES= sbin/rbl-milter -.if defined(NO_WERROR) -pre-configure: - ${REINPLACE_CMD} -e 's!-Werror!!' ${WRKSRC}/configure -.endif - -.include <bsd.port.pre.mk> - -.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" - CONFIGURE_ARGS+= --with-sendmail=${MILTERBASE} \ --with-sendmail-obj=${MILTERBASE}/lib -.include <bsd.port.post.mk> +.include "${.CURDIR}/../sendmail/bsd.milter.mk" +.include <bsd.port.mk> diff --git a/mail/rbl-milter/files/patch-configure b/mail/rbl-milter/files/patch-configure index 743700e..df676c4 100644 --- a/mail/rbl-milter/files/patch-configure +++ b/mail/rbl-milter/files/patch-configure @@ -6,8 +6,8 @@ LDFLAGS="$LDFLAGS -L$SENDMAIL_OBJ/libmilter -L$SENDMAIL_OBJ/libsm -L$SENDMAIL_OBJ/libsmutil -L$SENDMAIL_OBJ/lib"; -CFLAGS="$CFLAGS -Wall -Werror" -LIBS="$LIBS -pthread -lpthread" -+CFLAGS="$CFLAGS $PTHREAD_CFLAGS -Wall -Werror" -+LIBS="$LIBS $PTHREAD_LIBS" ++CFLAGS="$CFLAGS -Wall" ++LIBS="$LIBS -lpthread" echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 diff --git a/mail/scam-backscatter/Makefile b/mail/scam-backscatter/Makefile index b392da5..08c6c90 100644 --- a/mail/scam-backscatter/Makefile +++ b/mail/scam-backscatter/Makefile @@ -28,12 +28,9 @@ USEMAILERTABLE_DESC= Use mailertable to map domains to backends .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" LDFLAGS+= ${SENDMAIL_LDFLAGS} -LIBS+= -lmilter +LIBS+= -lmilter -lpthread LIBS+= ${SENDMAIL_LDADD} -CFLAGS+= ${PTHREAD_CFLAGS} -LIBS+= ${PTHREAD_LIBS} - .if ${PORT_OPTIONS:MALLDOMAINS} CFLAGS+= -DALLDOMAINS .endif diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index e37fb3c..0d57e6b 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -122,8 +122,7 @@ PLIST_SUB+= MILTER_SHARED="@comment " .endif .endif -SED_SCRIPT= -e "s|\`-pthread\'|\`${PTHREAD_LIBS}\'|" \ - -e "s|\`-O\'|\`${CFLAGS}\'|" \ +SED_SCRIPT= -e "s|\`-O\'|\`${CFLAGS}\'|" \ -e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|' .if ! ${PORT_OPTIONS:MNIS} diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile index 0eb54d9..c5c5e4c 100644 --- a/mail/sentinel/Makefile +++ b/mail/sentinel/Makefile @@ -28,10 +28,9 @@ CFLAGS+= -DDO_NOT_DECODE_SUBJECT .endif do-build: - cd ${WRKSRC} && \ - ${CC} ${CFLAGS} ${PTHREAD_CFLAGS} \ - -o ${PORTNAME} ${PORTNAME}.c ${LDFLAGS} \ - -lmilter -lpcre -lpcreposix ${PTHREAD_LIBS} + (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + ${CC} ${CFLAGS} -o ${PORTNAME} sentinel.c ${LDFLAGS} \ + -lmilter -lpcre -lpcreposix -lpthread) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sentinel ${STAGEDIR}${PREFIX}/sbin/ diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile index 1296224..35755fc 100644 --- a/mail/sid-milter/Makefile +++ b/mail/sid-milter/Makefile @@ -46,9 +46,7 @@ PLIST_FILES+= include/libar.h lib/libar.a man/man3/ar.3.gz .endif pre-configure: - ${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \ - -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \ - -e "s|\`-O'|\`${CFLAGS}'|g" \ + ${REINPLACE_CMD} -e "s|\`-O'|\`${CFLAGS}'|g" \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/devtools/OS/FreeBSD ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \ diff --git a/mail/smtptrapd/Makefile b/mail/smtptrapd/Makefile index 0aba2e3..e64b5e3 100644 --- a/mail/smtptrapd/Makefile +++ b/mail/smtptrapd/Makefile @@ -14,7 +14,8 @@ USE_RC_SUBR= smtptrapd PLIST_FILES= bin/smtptrapd do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -o smtptrapd smtptrapd.c + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + ${CC} ${CFLAGS} -lpthread -o smtptrapd smtptrapd.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/smtptrapd ${STAGEDIR}${PREFIX}/bin/ diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile index b43955a..7f20b39 100644 --- a/mail/spamilter/Makefile +++ b/mail/spamilter/Makefile @@ -20,8 +20,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --have-resn USE_RC_SUBR= spamilter -CFLAGS+= ${PTHREAD_CFLAGS:S=""==} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread MAKE_ENV+= __MAKE_CONF=/dev/null BINFILES= spamilter-system-report spamilter-user-report diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index 8c91a5a..d2c9108 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -82,8 +82,7 @@ MAKEFILES= Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \ src/icons/Makefile.in post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \ - s|-lresolv||g; s|-lpisock\"|${ICONV_LIB} &|g;' \ + @${REINPLACE_CMD} -e 's|-lresolv||g; s|-lpisock\"|${ICONV_LIB} &|g;' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \ ${WRKSRC}/libsylph/procmime.c diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile index 89f1707..92d9c13 100644 --- a/mail/vbsfilter/Makefile +++ b/mail/vbsfilter/Makefile @@ -17,9 +17,8 @@ USE_RC_SUBR= vbsfilter PLIST_FILES= libexec/vbsfilter CTARGETS+= vbsfilter-${PORTVERSION} -LIBS+= ${PTHREAD_LIBS} -LIBS+= -lmilter -CFLAGS+= -Wall ${PTHREAD_CFLAGS:S=""==} +LIBS+= -lpthread -lmilter +CFLAGS+= -Wall .include <bsd.port.pre.mk> |
