From owner-svn-ports-all@FreeBSD.ORG Wed Jul 2 20:33:21 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE04467E; Wed, 2 Jul 2014 20:33:21 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B2502E96; Wed, 2 Jul 2014 20:33:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62KXL00075444; Wed, 2 Jul 2014 20:33:21 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62KXLaI075439; Wed, 2 Jul 2014 20:33:21 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201407022033.s62KXLaI075439@svn.freebsd.org> From: Tijl Coosemans Date: Wed, 2 Jul 2014 20:33:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360257 - in head/textproc/openjade: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 20:33:21 -0000 Author: tijl Date: Wed Jul 2 20:33:20 2014 New Revision: 360257 URL: http://svnweb.freebsd.org/changeset/ports/360257 QAT: https://qat.redports.org/buildarchive/r360257/ Log: - Add USES=libtool - Remove hack for gcc 3.x Modified: head/textproc/openjade/Makefile head/textproc/openjade/files/patch-ae head/textproc/openjade/pkg-plist Modified: head/textproc/openjade/Makefile ============================================================================== --- head/textproc/openjade/Makefile Wed Jul 2 20:22:55 2014 (r360256) +++ head/textproc/openjade/Makefile Wed Jul 2 20:33:20 2014 (r360257) @@ -3,7 +3,7 @@ PORTNAME= openjade PORTVERSION= 1.3.3p1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.3.3 DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-pre/} @@ -14,8 +14,8 @@ COMMENT= Object-oriented SGML/XML parser LIB_DEPENDS= libosp.so:${PORTSDIR}/textproc/opensp RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr +USES= gettext gmake libtool perl5 USE_LDCONFIG= yes -USES= gettext gmake perl5 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \ --datadir=${DATADIR} @@ -29,7 +29,6 @@ XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr DATADIR= ${PREFIX}/share/sgml/openjade post-patch: - @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|||' ${WRKSRC}/style/MultiLineInlineNote.cxx post-install: @@ -41,13 +40,4 @@ post-install: "${WRKSRC}", $$3, "${STAGEDIR}${PREFIX}", $$4}' | \ ${SH} -.include - -# This port cannot be CFLAGS safe, using optimizations such as -# 'march=-mpentium -Os' produces core dumps with certain input files -# Therefore, we'd better remove all machine optimizations and any -O -# other than -O{0,1,}. Idea taken from palm/prc-tools-gcc. -CPPFLAGS:= -O ${CFLAGS:N-O*:N-m*} -LDFLAGS+= -L${LOCALBASE}/lib - -.include +.include Modified: head/textproc/openjade/files/patch-ae ============================================================================== --- head/textproc/openjade/files/patch-ae Wed Jul 2 20:22:55 2014 (r360256) +++ head/textproc/openjade/files/patch-ae Wed Jul 2 20:33:20 2014 (r360257) @@ -21,11 +21,3 @@ $FreeBSD$ echo "$as_me:$LINENO: checking for gettext" >&5 echo $ECHO_N "checking for gettext... $ECHO_C" >&6 if test "${ac_cv_func_gettext+set}" = set; then -@@ -9792,6 +9796,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' Modified: head/textproc/openjade/pkg-plist ============================================================================== --- head/textproc/openjade/pkg-plist Wed Jul 2 20:22:55 2014 (r360256) +++ head/textproc/openjade/pkg-plist Wed Jul 2 20:33:20 2014 (r360257) @@ -1,16 +1,16 @@ bin/openjade lib/libogrove.a -lib/libogrove.la lib/libogrove.so lib/libogrove.so.0 +lib/libogrove.so.0.0.1 lib/libospgrove.a -lib/libospgrove.la lib/libospgrove.so lib/libospgrove.so.0 +lib/libospgrove.so.0.0.1 lib/libostyle.a -lib/libostyle.la lib/libostyle.so lib/libostyle.so.0 +lib/libostyle.so.0.0.1 @unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG openjade/catalog @comment INSTALL_DATA: dsssl/README.jadetex %%DATADIR%%/README.jadetex @comment INSTALL_DATA: dsssl/builtins.dsl %%DATADIR%%/builtins.dsl