Date: Thu, 25 Feb 2016 18:11:38 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409547 - in head/mail/libdomainkeys: . files Message-ID: <201602251811.u1PIBcPR033498@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Feb 25 18:11:37 2016 New Revision: 409547 URL: https://svnweb.freebsd.org/changeset/ports/409547 Log: - Fix build on current - Simplify custom makefile handling Modified: head/mail/libdomainkeys/Makefile head/mail/libdomainkeys/files/Makefile Modified: head/mail/libdomainkeys/Makefile ============================================================================== --- head/mail/libdomainkeys/Makefile Thu Feb 25 18:09:51 2016 (r409546) +++ head/mail/libdomainkeys/Makefile Thu Feb 25 18:11:37 2016 (r409547) @@ -13,13 +13,12 @@ USES= uidfix USE_LDCONFIG= yes SHLIB_MAJOR= 3 PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" +MAKE_ENV= SHLIB_MAJOR="${SHLIB_MAJOR}" USE_OPENSSL= yes post-patch: - ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.prev - @${SED} -e "s=%%SHLIB_MAJOR%%=${SHLIB_MAJOR}=g" \ - ${FILESDIR}/Makefile > ${WRKSRC}/Makefile + @${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile post-install: @${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/mail/libdomainkeys/files/Makefile ============================================================================== --- head/mail/libdomainkeys/files/Makefile Thu Feb 25 18:09:51 2016 (r409546) +++ head/mail/libdomainkeys/files/Makefile Thu Feb 25 18:11:37 2016 (r409547) @@ -4,8 +4,6 @@ LIB = domainkeys SRCS= dns_txt.c domainkeys.c dktrace.c INCS= domainkeys.h dktrace.h -SHLIB_MAJOR= %%SHLIB_MAJOR%% - LIBDIR= ${PREFIX}/lib INCLUDEDIR= ${PREFIX}/include CFLAGS+= -DBIND_8_COMPAT -I${OPENSSLBASE}/include @@ -14,6 +12,7 @@ LDFLAGS+= -lcrypto -L${OPENSSLBASE}/lib NO_PROFILE= makeheader: makeheader.c + ${CC} ${CFLAGS} makeheader.c -o makeheader domainkeys.h: domainkeys.c makeheader ./makeheader <domainkeys.c >domainkeys.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602251811.u1PIBcPR033498>