Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Jun 2014 13:42:17 +0000 (UTC)
From:      Jun Kuriyama <kuriyama@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r357311 - in head/textproc: html iso12083 openfts sgmlformat sgmlformat/files
Message-ID:  <201406101342.s5ADgHXG012865@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kuriyama
Date: Tue Jun 10 13:42:17 2014
New Revision: 357311
URL: http://svnweb.freebsd.org/changeset/ports/357311
QAT: https://qat.redports.org/buildarchive/r357311/

Log:
  - Stagify.

Added:
  head/textproc/sgmlformat/files/patch-sgmlfmt__Makefile   (contents, props changed)
  head/textproc/sgmlformat/files/patch-transpec-_Makefile   (contents, props changed)
Modified:
  head/textproc/html/Makefile
  head/textproc/iso12083/Makefile
  head/textproc/openfts/Makefile
  head/textproc/openfts/pkg-plist
  head/textproc/sgmlformat/Makefile
  head/textproc/sgmlformat/pkg-plist

Modified: head/textproc/html/Makefile
==============================================================================
--- head/textproc/html/Makefile	Tue Jun 10 13:29:31 2014	(r357310)
+++ head/textproc/html/Makefile	Tue Jun 10 13:42:17 2014	(r357311)
@@ -21,11 +21,10 @@ NO_WRKSUBDIR=	yes
 PLIST_SUB=	DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR}
 PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
 
-INSTDIR=	${PREFIX}/share/sgml/html
+INSTDIR=	${STAGEDIR}${PREFIX}/share/sgml/html
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
-NO_STAGE=	yes
 pre-su-install:
 	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
 
@@ -34,7 +33,4 @@ do-install:
 	@${CHMOD} ${SHAREMODE} `${FIND} ${INSTDIR} -type f`
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
-post-install:
-	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/catalog
-
 .include <bsd.port.mk>

Modified: head/textproc/iso12083/Makefile
==============================================================================
--- head/textproc/iso12083/Makefile	Tue Jun 10 13:29:31 2014	(r357310)
+++ head/textproc/iso12083/Makefile	Tue Jun 10 13:42:17 2014	(r357311)
@@ -23,11 +23,10 @@ NO_WRKSUBDIR=	yes
 PLIST_SUB=	DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR}
 PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
 
-INSTDIR=	${PREFIX}/share/sgml/iso12083
+INSTDIR=	${STAGEDIR}${PREFIX}/share/sgml/iso12083
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
-NO_STAGE=	yes
 pre-install:
 	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
 
@@ -37,7 +36,4 @@ do-install:
 	done
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/catalog
 
-post-install:
-	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/catalog
-
 .include <bsd.port.mk>

Modified: head/textproc/openfts/Makefile
==============================================================================
--- head/textproc/openfts/Makefile	Tue Jun 10 13:29:31 2014	(r357310)
+++ head/textproc/openfts/Makefile	Tue Jun 10 13:42:17 2014	(r357311)
@@ -17,29 +17,22 @@ USE_PGSQL=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-MAN3=	Search::OpenFTS.3 Search::OpenFTS::Base.3 \
-	Search::OpenFTS::Dict::PorterEng.3 Search::OpenFTS::Dict::Snowball.3 \
-	Search::OpenFTS::Dict::Synonym.3 Search::OpenFTS::Dict::UnknownDict.3 \
-	Search::OpenFTS::Index.3 Search::OpenFTS::Morph::ISpell.3 \
-	Search::OpenFTS::Parser.3
-
 PORTDOCS=	Changes INSTALL README primer.html
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
+	@${ECHO_MSG} "===> Examples installed in ${STAGEDIR}${EXAMPLESDIR}."
 .endif
 
 .if !defined(NOPORTDOCS)
 	@${CP} -p ${WRKSRC}/doc/primer.html ${WRKSRC}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	@${ECHO_MSG} "===> Documentation installed in ${STAGEDIR}${DOCSDIR}."
 .endif
 
 # Sample DB initialization.

Modified: head/textproc/openfts/pkg-plist
==============================================================================
--- head/textproc/openfts/pkg-plist	Tue Jun 10 13:29:31 2014	(r357310)
+++ head/textproc/openfts/pkg-plist	Tue Jun 10 13:42:17 2014	(r357311)
@@ -1,3 +1,12 @@
+%%PERL5_MAN3%%/Search::OpenFTS.3.gz
+%%PERL5_MAN3%%/Search::OpenFTS::Base.3.gz
+%%PERL5_MAN3%%/Search::OpenFTS::Dict::PorterEng.3.gz
+%%PERL5_MAN3%%/Search::OpenFTS::Dict::Snowball.3.gz
+%%PERL5_MAN3%%/Search::OpenFTS::Dict::Synonym.3.gz
+%%PERL5_MAN3%%/Search::OpenFTS::Dict::UnknownDict.3.gz
+%%PERL5_MAN3%%/Search::OpenFTS::Index.3.gz
+%%PERL5_MAN3%%/Search::OpenFTS::Morph::ISpell.3.gz
+%%PERL5_MAN3%%/Search::OpenFTS::Parser.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Base.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict/PorterEng.pm

Modified: head/textproc/sgmlformat/Makefile
==============================================================================
--- head/textproc/sgmlformat/Makefile	Tue Jun 10 13:29:31 2014	(r357310)
+++ head/textproc/sgmlformat/Makefile	Tue Jun 10 13:42:17 2014	(r357311)
@@ -13,15 +13,11 @@ COMMENT=	Generates groff and HTML from l
 
 USES=		perl5
 USE_PERL5=	run
-
-MAN1=		instant.1 sgmlfmt.1
-MAN5=		transpec.5
-MANCOMPRESSED=	yes
+MAKE_ENV=	STAGEDIR=${STAGEDIR}
 
 # There are two ports that satisfy the nsgmls requirement.
 # Jade is preferred.
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_ARCH} != "i386"
@@ -44,6 +40,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,nsgmls,onsgmls,g' ${WRKSRC}/instant/traninit.c
 .endif
 
+pre-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/sgml/transpec
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 

Added: head/textproc/sgmlformat/files/patch-sgmlfmt__Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/sgmlformat/files/patch-sgmlfmt__Makefile	Tue Jun 10 13:42:17 2014	(r357311)
@@ -0,0 +1,19 @@
+--- ./sgmlfmt/Makefile.orig	2014-06-10 08:00:07.272462749 +0900
++++ ./sgmlfmt/Makefile	2014-06-10 08:01:56.855462177 +0900
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-FILES=		sgmlfmt
++SCRIPTS=		sgmlfmt
+ CLEANFILES=	sgmlfmt
+ MAN1=		sgmlfmt.1
+ 
+@@ -13,7 +13,7 @@
+ 	sed -e 's|##PERL##|${PREFIX}/bin/perl|' -e 's|##PREFIX##|${PREFIX}|' < sgmlfmt.pl > sgmlfmt
+ .endif
+ 
+-afterinstall:
++no-afterinstall:
+ 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${FILES} \
+ 		${BINDIR}
+ 

Added: head/textproc/sgmlformat/files/patch-transpec-_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/sgmlformat/files/patch-transpec-_Makefile	Tue Jun 10 13:42:17 2014	(r357311)
@@ -0,0 +1,16 @@
+--- transpec/Makefile.orig	2014-06-10 21:01:50.280462342 +0900
++++ transpec/Makefile	2014-06-10 21:42:02.463462646 +0900
+@@ -9,11 +9,9 @@
+ 
+ all clean cleandir depend lint tags:
+ 
+-beforeinstall:
+-	@mkdir -p ${TRANSPEC_DIR}
+-
+ afterinstall:
+ 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
+-		${TRANSPEC_DIR}
++		${STAGEDIR}${PREFIX}/share/sgml/transpec/
+ 
+ .include <bsd.prog.mk>
++

Modified: head/textproc/sgmlformat/pkg-plist
==============================================================================
--- head/textproc/sgmlformat/pkg-plist	Tue Jun 10 13:29:31 2014	(r357310)
+++ head/textproc/sgmlformat/pkg-plist	Tue Jun 10 13:42:17 2014	(r357311)
@@ -12,6 +12,9 @@ bin/roff.cmap
 bin/roff.sdata
 bin/sgmlfmt
 bin/transpec.dtd
+man/man1/instant.1.gz
+man/man1/sgmlfmt.1.gz
+man/man5/transpec.5.gz
 share/sgml/transpec/catalog
 share/sgml/transpec/docbook-html.ts
 share/sgml/transpec/docbook-roff.ts



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406101342.s5ADgHXG012865>