diff options
| author | tijl <tijl@FreeBSD.org> | 2014-09-19 01:52:54 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-09-19 01:52:54 +0800 |
| commit | 81329c0fbc9b8ca629c78ed6cf0edddc1fdff773 (patch) | |
| tree | fcd423711fc2030204a6c52e0ea74ba3d48b8f86 | |
| parent | c9020a4728645660b548ed43bccfbfb633861b09 (diff) | |
| download | freebsd-ports-graphics-81329c0fbc9b8ca629c78ed6cf0edddc1fdff773.tar.gz freebsd-ports-graphics-81329c0fbc9b8ca629c78ed6cf0edddc1fdff773.tar.zst freebsd-ports-graphics-81329c0fbc9b8ca629c78ed6cf0edddc1fdff773.zip | |
- Convert to USES=autoreconf and add INSTALL_TARGET=install-strip
- Use post-install instead of do-install
| -rw-r--r-- | dns/nss_mdns/Makefile | 24 | ||||
| -rw-r--r-- | dns/nss_mdns/files/patch-aclocal.m4 | 12 |
2 files changed, 5 insertions, 31 deletions
diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile index 0fd1bef98ea..21771195a4c 100644 --- a/dns/nss_mdns/Makefile +++ b/dns/nss_mdns/Makefile @@ -18,10 +18,10 @@ LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app CONFLICTS_INSTALL= mDNSResponder_nss-[0-9]* -USE_AUTOTOOLS= autoconf automake -USES= gmake libtool +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= autoreconf gmake libtool USE_LDCONFIG= yes -AUTOTOOLSFILES= aclocal.m4 OPTIONS_DEFINE= SEARCH_DOMAINS DOCS SEARCH_DOMAINS_DESC= Honour search domains in resolv.conf @@ -29,8 +29,6 @@ SEARCH_DOMAINS_DESC= Honour search domains in resolv.conf CONFIGURE_ARGS+= \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-static \ - --enable-shared \ --enable-avahi \ --disable-legacy \ --disable-lynx @@ -43,17 +41,9 @@ INSTALLED_MODULES=nss_mdns nss_mdns_minimal CONFIGURE_ARGS+= --enable-search-domains .endif -# -# libtool is used, therefore we must perform a GNU make based install, -# followed by removal of build rubble; we must create our own .so symlinks; -# we do this from the do-install target so as to avoid causing any -# problems if we are later packaged. -# -do-install: - @( cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} ) +post-install: .for INSTALLED_MODULE in ${INSTALLED_MODULES} - ( cd ${STAGEDIR}${PREFIX}/lib ; ${LN} -s ${INSTALLED_MODULE}.so.1 ${INSTALLED_MODULE}.so ) - ${RM} ${STAGEDIR}${PREFIX}/lib/${INSTALLED_MODULE}.a ${STAGEDIR}${PREFIX}/lib/${INSTALLED_MODULE}.la + ${LN} -s ${INSTALLED_MODULE}.so.1 ${STAGEDIR}${PREFIX}/lib/${INSTALLED_MODULE}.so .endfor .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR}/ @@ -66,8 +56,4 @@ do-install: PLIST_FILES= ${INSTALLED_MODULES:C/^/lib\//:C/$/.so/} ${INSTALLED_MODULES:C/^/lib\//:C/$/.so.1/} PORTDOCS= README README.html -post-configure: - @${FIND} ${WRKSRC} -name Makefile -print | \ - ${XARGS} ${REINPLACE_CMD} -e 's|MKDIR_P|mkdir_p|g' - .include <bsd.port.mk> diff --git a/dns/nss_mdns/files/patch-aclocal.m4 b/dns/nss_mdns/files/patch-aclocal.m4 deleted file mode 100644 index dde3af35c18..00000000000 --- a/dns/nss_mdns/files/patch-aclocal.m4 +++ /dev/null @@ -1,12 +0,0 @@ ---- aclocal.m4.orig 2007-05-12 09:55:30.000000000 -0500 -+++ aclocal.m4 2010-09-28 10:18:36.000000000 -0500 -@@ -6392,3 +6392,3 @@ - # generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) -+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="%%AUTOMAKE_VERSION%%"]) - -@@ -6399,3 +6399,3 @@ - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.9.6])]) -+ [AM_AUTOMAKE_VERSION([%%AUTOMAKE_APIVER%%])]) - |