Index: head/mail/qmail-dk/Makefile =================================================================== --- head/mail/qmail-dk/Makefile (revision 475016) +++ head/mail/qmail-dk/Makefile (revision 475017) @@ -1,64 +1,62 @@ # $FreeBSD$ PORTNAME= dk PORTVERSION= 0.54 PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= QMAIL PKGNAMEPREFIX= qmail- DISTFILES= qmail-1.03.tar.gz DIST_SUBDIR= qmail MAINTAINER= ports@FreeBSD.org COMMENT= DomainKeys implementation for qmail -BROKEN_aarch64= fails to link: scan_ulong.c:(.text+0x0): duplicate symbol 'scan_ulong' - LIB_DEPENDS+= libdomainkeys.so:mail/libdomainkeys PATCH_SITES= QMAIL PATCHFILES= qmail-1.03-dk-0.54.patch USES= qmail ssl PREFIX?= ${QMAIL_PREFIX} WRKSRC= ${WRKDIR}/qmail-1.03 PLIST_FILES= "@(qmailq,,4711) bin/qmail-dk" \ man/man8/qmail-dk.8.gz ALL_TARGET= qmail-dk qmail-dk.8 CFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= SMTP_AUTH OPTIONS_DEFAULT=SMTP_AUTH SMTP_AUTH_DESC= Support SMTP_AUTH .include .if ${PORT_OPTIONS:MSMTP_AUTH} PATCH_SITES+= http://jeremy.kister.net/code/:auth PATCHFILES+= qmail-dk-0.54-auth.patch:auth .endif do-configure: @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc @${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-qmail post-patch: @${REINPLACE_CMD} -e 's,"../domainkeys.h",,' \ ${WRKSRC}/qmail-dk.c @${REINPLACE_CMD} -E 's|( *c\(auto.*")qmail-smtpd(".*)$$|\1qmail-smtpd\2\1qmail-dk\2|' \ ${WRKSRC}/hier.c @${REINPLACE_CMD} \ -e 's|../libdomainkeys.a|${LOCALBASE}/lib/libdomainkeys.a|' \ -e 's|\(-lcrypto\)|-L${OPENSSLLIB} \1|' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} 's!nofiles!qnofiles!g' \ ${WRKSRC}/conf-groups do-install: ${INSTALL_PROGRAM} ${WRKSRC}/qmail-dk ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/qmail-dk.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .include Index: head/mail/qmail-dk/files/patch-Makefile =================================================================== --- head/mail/qmail-dk/files/patch-Makefile (nonexistent) +++ head/mail/qmail-dk/files/patch-Makefile (revision 475017) @@ -0,0 +1,31 @@ +/usr/bin/ld: error: duplicate symbol: scan_ulong + >>> defined at scan_ulong.c + >>> scan_ulong.o:(scan_ulong) in archive fs.a + >>> defined at scan_ulong.c + >>> scan_ulong.o:(.text+0x0) + +--- Makefile.orig 2018-07-20 14:10:56 UTC ++++ Makefile +@@ -37,8 +37,8 @@ scan.h fmt.h + ./compile auto-gid.c + + auto-int: \ +-load auto-int.o substdio.a error.a str.a fs.a +- ./load auto-int substdio.a error.a str.a fs.a ++load auto-int.o substdio.a error.a str.a fs.a scan_ulong.o ++ ./load auto-int substdio.a error.a str.a fs.a scan_ulong.o + + auto-int.o: \ + compile auto-int.c substdio.h readwrite.h exit.h scan.h fmt.h +@@ -609,9 +609,9 @@ strerr.h substdio.h fmt.h + + fs.a: \ + makelib fmt_str.o fmt_strn.o fmt_uint.o fmt_uint0.o fmt_ulong.o \ +-scan_ulong.o scan_8long.o ++scan_8long.o + ./makelib fs.a fmt_str.o fmt_strn.o fmt_uint.o fmt_uint0.o \ +- fmt_ulong.o scan_ulong.o scan_8long.o ++ fmt_ulong.o scan_8long.o + + getln.a: \ + makelib getln.o getln2.o Property changes on: head/mail/qmail-dk/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property