From owner-svn-ports-head@FreeBSD.ORG Tue Jan 28 07:32: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 BE3A97F4; Tue, 28 Jan 2014 07:32: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 A9D461087; Tue, 28 Jan 2014 07:32:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0S7WKgU050993; Tue, 28 Jan 2014 07:32:20 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0S7WKCb050991; Tue, 28 Jan 2014 07:32:20 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401280732.s0S7WKCb050991@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 28 Jan 2014 07:32:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341501 - head/textproc/opensp 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: Tue, 28 Jan 2014 07:32:20 -0000 Author: bapt Date: Tue Jan 28 07:32:19 2014 New Revision: 341501 URL: http://svnweb.freebsd.org/changeset/ports/341501 QAT: https://qat.redports.org/buildarchive/r341501/ Log: Support stage Be less creative about DOCS installation Add NLS and DOCS options Modified: head/textproc/opensp/Makefile head/textproc/opensp/pkg-plist Modified: head/textproc/opensp/Makefile ============================================================================== --- head/textproc/opensp/Makefile Tue Jan 28 04:48:10 2014 (r341500) +++ head/textproc/opensp/Makefile Tue Jan 28 07:32:19 2014 (r341501) @@ -10,6 +10,8 @@ MASTER_SITES= SF/openjade/${PORTNAME:L}/ MAINTAINER= kuriyama@FreeBSD.org COMMENT= This package is a collection of SGML/XML tools called OpenSP +OPTIONS_DEFINE= DOCS NLS + USE_LDCONFIG= yes USES= gmake iconv perl5 GNU_CONFIGURE= yes @@ -19,20 +21,12 @@ CONFIGURE_ARGS= --enable-default-catalog LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +OPTIONS_SUB= yes +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext -#MAN1= onsgmls.1 osgmlnorm.1 ospam.1 ospent.1 osx.1 -.include +PORTDOCS= *.htm NEWS AUTHORS README ABOUT-NLS BUGS ChangeLog # This port cannot be CFLAGS safe, using optimizations such as # 'march=-mpentium -Os' produces core dumps with certain input files @@ -41,16 +35,8 @@ PLIST_SUB+= NLS="@comment " CPPFLAGS:= -O ${CFLAGS:N-O*:N-m*} post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${CAT} ${PLIST} | \ - ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | \ - ${AWK} '/^@comment INSTALL_DATA:/ \ - {printf "if ! ${GREP} -q \"%s\" ${PLIST}; then ${ECHO_CMD} \"%s\" >> %s; fi; %s %s/%s %s/%s\n", \ - $$4, $$4, "${TMPPLIST}", "${INSTALL_DATA}", \ - "${WRKSRC}", $$3, "${PREFIX}", $$4}' | \ - ${SH} && \ - ${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS:N\*.htm} ${STAGEDIR}${DOCSDIR} -.include +.include Modified: head/textproc/opensp/pkg-plist ============================================================================== --- head/textproc/opensp/pkg-plist Tue Jan 28 04:48:10 2014 (r341500) +++ head/textproc/opensp/pkg-plist Tue Jan 28 07:32:19 2014 (r341501) @@ -151,36 +151,6 @@ lib/libosp.so.5 %%NLS%%share/locale/ja/LC_MESSAGES/sp5.mo %%NLS%%share/locale/sv/LC_MESSAGES/sp5.mo %%NLS%%share/locale/tr/LC_MESSAGES/sp5.mo -@comment the following lines used for installation of doc files -@comment INSTALL_DATA: doc/archform.htm %%DOCSDIR%%/archform.htm -@comment INSTALL_DATA: doc/autoconf.htm %%DOCSDIR%%/autoconf.htm -@comment INSTALL_DATA: doc/build.htm %%DOCSDIR%%/build.htm -@comment INSTALL_DATA: doc/catalog.htm %%DOCSDIR%%/catalog.htm -@comment INSTALL_DATA: doc/charset.htm %%DOCSDIR%%/charset.htm -@comment INSTALL_DATA: doc/features.htm %%DOCSDIR%%/features.htm -@comment INSTALL_DATA: doc/generic.htm %%DOCSDIR%%/generic.htm -@comment INSTALL_DATA: doc/ideas.htm %%DOCSDIR%%/ideas.htm -@comment INSTALL_DATA: doc/index.htm %%DOCSDIR%%/index.htm -@comment INSTALL_DATA: doc/new.htm %%DOCSDIR%%/new.htm -@comment INSTALL_DATA: doc/nsgmls.htm %%DOCSDIR%%/nsgmls.htm -@comment INSTALL_DATA: doc/sgmldecl.htm %%DOCSDIR%%/sgmldecl.htm -@comment INSTALL_DATA: doc/sgmlnorm.htm %%DOCSDIR%%/sgmlnorm.htm -@comment INSTALL_DATA: doc/sgmlsout.htm %%DOCSDIR%%/sgmlsout.htm -@comment INSTALL_DATA: doc/spam.htm %%DOCSDIR%%/spam.htm -@comment INSTALL_DATA: doc/spcat.htm %%DOCSDIR%%/spcat.htm -@comment INSTALL_DATA: doc/spent.htm %%DOCSDIR%%/spent.htm -@comment INSTALL_DATA: doc/sx.htm %%DOCSDIR%%/sx.htm -@comment INSTALL_DATA: doc/sysdecl.htm %%DOCSDIR%%/sysdecl.htm -@comment INSTALL_DATA: doc/sysid.htm %%DOCSDIR%%/sysid.htm -@comment INSTALL_DATA: doc/xml.htm %%DOCSDIR%%/xml.htm -@comment INSTALL_DATA: doc/xmlwarn.htm %%DOCSDIR%%/xmlwarn.htm -@comment INSTALL_DATA: NEWS %%DOCSDIR%%/NEWS -@comment INSTALL_DATA: AUTHORS %%DOCSDIR%%/AUTHORS -@comment INSTALL_DATA: README %%DOCSDIR%%/README -@comment INSTALL_DATA: ABOUT-NLS %%DOCSDIR%%/ABOUT-NLS -@comment INSTALL_DATA: BUGS %%DOCSDIR%%/BUGS -@comment INSTALL_DATA: COPYING %%DOCSDIR%%/COPYING -@comment INSTALL_DATA: ChangeLog %%DOCSDIR%%/ChangeLog share/sgml/openjade/OpenSP/HTML32.dcl share/sgml/openjade/OpenSP/HTML32.dtd share/sgml/openjade/OpenSP/HTML32.soc