Date: Fri, 18 Jul 2014 09:41:42 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362199 - head/misc/sword Message-ID: <201407180941.s6I9fgIg062158@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Jul 18 09:41:42 2014 New Revision: 362199 URL: http://svnweb.freebsd.org/changeset/ports/362199 QAT: https://qat.redports.org/buildarchive/r362199/ Log: - USES=libtool pathfix - Add INSTALL_TARGET=install-strip - Avoid USE_AUTOTOOLS - Use @sample Modified: head/misc/sword/Makefile head/misc/sword/pkg-plist Modified: head/misc/sword/Makefile ============================================================================== --- head/misc/sword/Makefile Fri Jul 18 09:38:01 2014 (r362198) +++ head/misc/sword/Makefile Fri Jul 18 09:41:42 2014 (r362199) @@ -3,7 +3,7 @@ PORTNAME= sword PORTVERSION= 1.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \ http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/ @@ -15,9 +15,10 @@ LICENSE= GPLv2 BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit -USES= gmake pkgconfig -USE_AUTOTOOLS= automake autoconf +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-conf --with-zlib +INSTALL_TARGET= install-strip +USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes SUB_FILES= pkg-message @@ -44,26 +45,12 @@ CONFIGURE_ARGS+= --with-clucene=${LOCALB CONFIGURE_ARGS+= --without-clucene --without-icu .endif -run-autotools:: run-autotools-aclocal - - @${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/configure - post-patch: - @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ - -e's|-O3||g' \ - -e 's|%%DESTDIR%%|${STAGEDIR}|g' \ - ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} 's|-O3||' ${WRKSRC}/configure post-install: - @${MKDIR} ${PREFIX}/share/sword/mods.d -.if !exists(${PREFIX}/etc/sword.conf) @(cd ${WRKSRC} && ${MAKE_CMD} install_config) -.else - @${ECHO_CMD} "Config file not installed since ${PREFIX}/etc/sword.conf already exists." - @${ECHO_CMD} "Please check that DataPath points to your modules (default ${DATADIR})."; -.endif - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} + ${MV} ${STAGEDIR}${PREFIX}/etc/sword.conf \ + ${STAGEDIR}${PREFIX}/etc/sword.conf.sample .include <bsd.port.mk> Modified: head/misc/sword/pkg-plist ============================================================================== --- head/misc/sword/pkg-plist Fri Jul 18 09:38:01 2014 (r362198) +++ head/misc/sword/pkg-plist Fri Jul 18 09:41:42 2014 (r362199) @@ -14,7 +14,7 @@ bin/xml2gbs bin/imp2gbs bin/imp2ld bin/mod2zmod -%%ETCDIR%%.conf +@sample etc/sword.conf include/sword/canon.h include/sword/canon_abbrevs.h include/sword/cipherfil.h @@ -186,7 +186,6 @@ include/sword/canon_null.h include/sword/canon_orthodox.h lib/libsword-%%PORTVERSION%%.so lib/libsword.a -lib/libsword.la lib/libsword.so libdata/pkgconfig/sword.pc %%DATADIR%%/locales.d/abbr.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407180941.s6I9fgIg062158>