From owner-svn-ports-head@FreeBSD.ORG Mon Feb 24 18:51:20 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A962DC8D; Mon, 24 Feb 2014 18:51:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 91C6718C7; Mon, 24 Feb 2014 18:51:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1OIpKm0062730; Mon, 24 Feb 2014 18:51:20 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1OIpKtq062727; Mon, 24 Feb 2014 18:51:20 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201402241851.s1OIpKtq062727@svn.freebsd.org> From: Tijl Coosemans Date: Mon, 24 Feb 2014 18:51:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345892 - in head/textproc/sablotron: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2014 18:51:20 -0000 Author: tijl Date: Mon Feb 24 18:51:19 2014 New Revision: 345892 URL: http://svnweb.freebsd.org/changeset/ports/345892 QAT: https://qat.redports.org/buildarchive/r345892/ Log: - Patch configure so it prefers libc iconv over libiconv. - Remove CHECK_LEAKS option and associated perl command from post-patch. It doesn't do anything on FreeBSD. - Remove ICONV_TYPECAST option and associated patch. Whether iconv requires a cast depends on the system. It isn't a user option. Just let configure auto-detect this. - Make the perl dependency conditional on the DOCS option. - USES=libtool. This removes another perl command from post-patch. - Replace remaining perl command in post-patch with REINPLACE_CMD. Added: head/textproc/sablotron/files/patch-configure (contents, props changed) Deleted: head/textproc/sablotron/files/patch-src__engine__encoding.cpp Modified: head/textproc/sablotron/Makefile head/textproc/sablotron/pkg-plist Modified: head/textproc/sablotron/Makefile ============================================================================== --- head/textproc/sablotron/Makefile Mon Feb 24 18:48:13 2014 (r345891) +++ head/textproc/sablotron/Makefile Mon Feb 24 18:51:19 2014 (r345892) @@ -3,6 +3,7 @@ PORTNAME= Sablot PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF/sablotron/sablotron-${PORTVERSION} @@ -13,35 +14,26 @@ LICENSE= GPLv2 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 -OPTIONS_DEFINE= CHECK_LEAKS DEBUGGER DISABLE_META DOCS \ - DOCUMENT_ERRORS DOM ICONV_TYPECAST +OPTIONS_DEFINE= DEBUGGER DISABLE_META DOCS DOCUMENT_ERRORS DOM -CHECK_LEAKS_DESC= Enable memory leaks checking DEBUGGER_DESC= Enable debugger DISABLE_META_DESC= Do not output the META html tag DOCUMENT_ERRORS_DESC= Allow document errors DOM_DESC= Use DOM -ICONV_TYPECAST_DESC= Use iconv typecast OPTIONS_DEFAULT= DOM DOCUMENT_ERRORS -CHECK_LEAKS_CONFIGURE_ENABLE= check-leaks DEBUGGER_CONFIGURE_ENABLE= debugger DISABLE_META_CONFIGURE_ON= --disable-adding-meta DOCS_BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser DOCS_CONFIGURE_ON= --with-html-dir=${DOCSDIR} +DOCS_USES= perl5 +DOCS_USE= PERL5=build DOM_CONFIGURE_ENABLE= dom DOCUMENT_ERRORS_CONFIGURE_ENABLE= document-errors -ICONV_TYPECAST_CONFIGURE_ENABLE= iconv-typecast -SHLIB_MAJOR= 70 # API changes counter -PLIST_SUB+= SHLIB_MAJOR="${SHLIB_MAJOR}" - -USES= gmake iconv perl5 -USE_PERL5= build patch -USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBTOOL=${LIBTOOL} +USES= gmake iconv libtool USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lexpat ${ICONV_LIB} @@ -58,12 +50,8 @@ DOC_FILES2= DEBUGGER NOTES .include post-patch: - @${PERL} -pi -e \ - 's!(?<=libsablot_la_LDFLAGS = -version-info )(\d+):(\d+):\1!${SHLIB_MAJOR}:$$1:${SHLIB_MAJOR}!;' \ - ${WRKSRC}/src/engine/Makefile.in - @${PERL} -pi -e 's!se // !! if $$. = 407' ${WRKSRC}/src/engine/base.h .if ! ${PORT_OPTIONS:MDOCS} - @${PERL} -pi -e 's!(?<=SUBDIRS = )(.*)!man!' ${WRKSRC}/doc/Makefile.in + @${REINPLACE_CMD} -e '/^SUBDIRS =/s/apidoc//' ${WRKSRC}/doc/Makefile.in .endif post-install: Added: head/textproc/sablotron/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sablotron/files/patch-configure Mon Feb 24 18:51:19 2014 (r345892) @@ -0,0 +1,21 @@ +--- configure.orig ++++ configure +@@ -22091,14 +22091,13 @@ + if test ! x$silent = xyes; then + exec 6>&1 + fi +- #standalone library rules over libc +- if test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then ++ if test $iconv_in_libc = 1; then ++ echo "$as_me:$LINENO: result: libc" >&5 ++echo "${ECHO_T}libc" >&6 ++ elif test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then + echo "$as_me:$LINENO: result: libiconv" >&5 + echo "${ECHO_T}libiconv" >&6 + ICONV_LIB=-liconv +- elif test $iconv_in_libc = 1; then +- echo "$as_me:$LINENO: result: libc" >&5 +-echo "${ECHO_T}libc" >&6 + else + echo "$as_me:$LINENO: result: not found (panic)" >&5 + echo "${ECHO_T}not found (panic)" >&6 Modified: head/textproc/sablotron/pkg-plist ============================================================================== --- head/textproc/sablotron/pkg-plist Mon Feb 24 18:48:13 2014 (r345891) +++ head/textproc/sablotron/pkg-plist Mon Feb 24 18:51:19 2014 (r345892) @@ -9,5 +9,6 @@ include/sxpath.h lib/libsablot.a lib/libsablot.la lib/libsablot.so -lib/libsablot.so.%%SHLIB_MAJOR%% +lib/libsablot.so.0 +lib/libsablot.so.0.100.3 man/man1/sabcmd.1.gz