Date: Mon, 11 Aug 2014 15:28:32 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364621 - in head/devel/styx: . files Message-ID: <53e8e120.2de9.2aa11df7@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Aug 11 15:28:31 2014 New Revision: 364621 URL: http://svnweb.freebsd.org/changeset/ports/364621 QAT: https://qat.redports.org/buildarchive/r364621/ Log: - Switch to USES=libtool, drop .la files - Strip libraries - Fix upstream docs and examples installation Added: head/devel/styx/files/patch-configure.in (contents, props changed) Deleted: head/devel/styx/files/patch-configure Modified: head/devel/styx/Makefile head/devel/styx/pkg-plist Modified: head/devel/styx/Makefile ============================================================================== --- head/devel/styx/Makefile Mon Aug 11 15:26:44 2014 (r364620) +++ head/devel/styx/Makefile Mon Aug 11 15:28:31 2014 (r364621) @@ -3,30 +3,23 @@ PORTNAME= styx PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.speculate.de/styx/ MAINTAINER= ports@FreeBSD.org COMMENT= Scanner/parser generator -OPTIONS_DEFINE= EXAMPLES DOCS -USE_AUTOTOOLS= libtool -USES= gmake iconv +USE_AUTOTOOLS= aclocal autoconf automake libtoolize +AUTOMAKE_ARGS= --add-missing +USES= gmake iconv libtool GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME} USE_LDCONFIG= yes +INSTALL_TARGET= install-strip -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${TAR} -C ${WRKSRC}/doc \ - --exclude "*.in" --exclude "*Makefile*" -cf - . | \ - ${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf - - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${TAR} -C ${WRKSRC} \ - --exclude "*.in" --exclude "*Makefile*" -cf - spe pat | \ - ${TAR} -C ${STAGEDIR}${EXAMPLESDIR} --unlink -xf - +OPTIONS_DEFINE= EXAMPLES DOCS .include <bsd.port.mk> Added: head/devel/styx/files/patch-configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/styx/files/patch-configure.in Mon Aug 11 15:28:31 2014 (r364621) @@ -0,0 +1,19 @@ +--- configure.in.orig 2003-12-09 18:36:00.000000000 +0300 ++++ configure.in 2014-08-11 18:59:29.000000000 +0400 +@@ -61,13 +61,13 @@ + dnl AC_PREFIX_DEFAULT(/usr/local/styx) + + AC_CACHE_CHECK( [where to install HTML documents], +- [ac_cv_htmldir],[ac_cv_htmldir='$(datadir)/doc']) ++ [ac_cv_htmldir],[ac_cv_htmldir='$(datadir)/doc/styx']) + htmldir=$ac_cv_htmldir + AC_CACHE_CHECK( [where to install SGML documents], +- [ac_cv_sgmldir],[ac_cv_sgmldir='$(datadir)/doc']) ++ [ac_cv_sgmldir],[ac_cv_sgmldir='$(datadir)/doc/styx']) + sgmldir=$ac_cv_sgmldir + AC_CACHE_CHECK( [where to install examples], +- [ac_cv_sampledir],[ac_cv_sampledir='$(datadir)/examples']) ++ [ac_cv_sampledir],[ac_cv_sampledir='$(datadir)/examples/styx']) + sampledir=$ac_cv_sampledir + + AC_SUBST(htmldir) Modified: head/devel/styx/pkg-plist ============================================================================== --- head/devel/styx/pkg-plist Mon Aug 11 15:26:44 2014 (r364620) +++ head/devel/styx/pkg-plist Mon Aug 11 15:28:31 2014 (r364621) @@ -89,19 +89,18 @@ include/styx/xml_lim.h include/styx/xml_pim.h include/styx/xml_test_cim.h include/styx/xmllit_lim.h -@dirrm include/styx lib/libdstyx.a -lib/libdstyx.la lib/libdstyx.so lib/libdstyx.so.2 +lib/libdstyx.so.2.0.0 lib/libdxml.a -lib/libdxml.la lib/libdxml.so lib/libdxml.so.1 +lib/libdxml.so.1.0.0 lib/libxstyx.a -lib/libxstyx.la lib/libxstyx.so lib/libxstyx.so.2 +lib/libxstyx.so.2.0.0 %%PORTDOCS%%%%DOCSDIR%%/bin__cim.htm %%PORTDOCS%%%%DOCSDIR%%/binimg.htm %%PORTDOCS%%%%DOCSDIR%%/binset.htm @@ -254,11 +253,46 @@ lib/libxstyx.so.2 %%PORTDOCS%%%%DOCSDIR%%/xml_pim.htm %%PORTDOCS%%%%DOCSDIR%%/xmllit_lim.htm %%PORTDOCS%%%%DOCSDIR%%/xstdosx.htm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example01/calc.sty +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example01/calctut.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example01/explist.calc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example01/mx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example01/readme +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example02/mx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example02/pl0.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example02/pl0.sty +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example02/readme +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example02/t +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example02/testpl0.pl0 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example02/todo +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example03/mx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example03/pl0.sty +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example03/pl0c.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example03/pl0r.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example03/readme +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example03/t +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example03/testpl0.pl0 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example03/todo +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example04/calc.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example04/calc.sty +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example04/mx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example04/pattern_file.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example04/readme +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example04/t +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example05/ide.config.in +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example05/mcfg.sty +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example05/mx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example05/readme +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example06/ipl.sty +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example06/mx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example06/readme +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example06/test.ipl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pat/lstydoc_us.htm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pat/pcmdbook.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pat/pcmddoc_us.htm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pat/rstydoc_us.htm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pat/tstydoc_us.htm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/readme %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spe/ccnv.sty %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spe/cdps.sty %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spe/cmd.sty @@ -273,8 +307,16 @@ lib/libxstyx.so.2 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spe/xml1.lex %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spe/xml2.lex %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spe/xmllit.sty +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spe/xsty %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spe/xxml -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/spe -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pat -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm include/styx +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/example01 +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/example02 +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/example03 +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/example04 +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/example05 +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/example06 +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/pat +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/spe +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e8e120.2de9.2aa11df7>