svn commit: r355072 - in head: chinese/xpdf japanese/xpdf korean/xpdf

[Hiroki Sato]

Author: hrs
Date: Sat May 24 18:29:07 2014
New Revision: 355072
URL: http://svnweb.freebsd.org/changeset/ports/355072
QAT: https://qat.redports.org/buildarchive/r355072/

Log:
  STAGEDIR support.

Modified:
  head/chinese/xpdf/Makefile
  head/chinese/xpdf/pkg-plist   (contents, props changed)
  head/japanese/xpdf/Makefile
  head/japanese/xpdf/pkg-plist   (contents, props changed)
  head/korean/xpdf/Makefile
  head/korean/xpdf/pkg-plist   (contents, props changed)

Modified: head/chinese/xpdf/Makefile
==============================================================================
--- head/chinese/xpdf/Makefile	Sat May 24 18:23:49 2014	(r355071)
+++ head/chinese/xpdf/Makefile	Sat May 24 18:29:07 2014	(r355072)
@@ -40,19 +40,22 @@ TRAD_FILES=	Adobe-CNS1.cidToUnicode Big5
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/chinese-simplified
-	cd ${WRKSRC}/xpdf-chinese-simplified \
-		&& ${INSTALL_DATA} ${SIMP_FILES} ${STAGEDIR}${DATADIR}/chinese-simplified
+	cd ${WRKSRC}/xpdf-chinese-simplified && \
+	    ${INSTALL_DATA} ${SIMP_FILES} \
+		${STAGEDIR}${DATADIR}/chinese-simplified
 	${MKDIR} ${STAGEDIR}${DATADIR}/chinese-traditional
-	cd ${WRKSRC}/xpdf-chinese-traditional \
-		&& ${INSTALL_DATA} ${TRAD_FILES} ${STAGEDIR}${DATADIR}/chinese-traditional
-	${INSTALL_DATA} ${WRKSRC}/dot.xpdfrc ${STAGEDIR}${DATADIR}/chinese-traditional
+	cd ${WRKSRC}/xpdf-chinese-traditional && \
+	    ${INSTALL_DATA} ${TRAD_FILES} \
+		${STAGEDIR}${DATADIR}/chinese-traditional
+	${INSTALL_DATA} ${WRKSRC}/dot.xpdfrc \
+	    ${STAGEDIR}${DATADIR}/chinese-traditional
 	${MKDIR} ${STAGEDIR}${DATADIR}/chinese-traditional/CMap
 	cd ${STAGEDIR}${DATADIR}/chinese-traditional/CMap && \
-		${FIND} ${ADOBECMAPDIR}/ac15/CMap \
-			-type f -exec ${LN} -s -f {} . \;
+	    ${FIND} ${ADOBECMAPDIR}/ac15/CMap \
+		-type f -exec ${LN} -s -f {} . \;
 	${MKDIR} ${STAGEDIR}${DATADIR}/chinese-simplified/CMap
 	cd ${STAGEDIR}${DATADIR}/chinese-simplified/CMap && \
-		${FIND} ${ADOBECMAPDIR}/ag15/CMap \
-			-type f -exec ${LN} -s -f {} . \;
+	    ${FIND} ${ADOBECMAPDIR}/ag15/CMap \
+		-type f -exec ${LN} -s -f {} . \;
 
 .include <bsd.port.mk>

Modified: head/chinese/xpdf/pkg-plist
==============================================================================
--- head/chinese/xpdf/pkg-plist	Sat May 24 18:23:49 2014	(r355071)
+++ head/chinese/xpdf/pkg-plist	Sat May 24 18:29:07 2014	(r355072)
@@ -1,3 +1,4 @@
+ at comment $FreeBSD$
 %%DATADIR%%/chinese-simplified/Adobe-GB1.cidToUnicode
 %%DATADIR%%/chinese-simplified/EUC-CN.unicodeMap
 %%DATADIR%%/chinese-simplified/GBK.unicodeMap

Modified: head/japanese/xpdf/Makefile
==============================================================================
--- head/japanese/xpdf/Makefile	Sat May 24 18:23:49 2014	(r355071)
+++ head/japanese/xpdf/Makefile	Sat May 24 18:29:07 2014	(r355072)
@@ -31,23 +31,13 @@ INSTALL_FILES=	Adobe-Japan1.cidToUnicode
 		EUC-JP.unicodeMap Shift-JIS.unicodeMap \
 		README ../dot.xpdfrc
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/japanese
+	${MKDIR} ${STAGEDIR}${DATADIR}/japanese
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} ${INSTALL_FILES} ${DATADIR}/japanese
-	${MKDIR} ${DATADIR}/japanese/CMap
-	cd ${DATADIR}/japanese/CMap && \
-		${FIND} ${ADOBECMAPDIR}/aj16/CMap ${ADOBECMAPDIR}/aj20/CMap \
-			-type f -exec ${LN} -s -f {} . \;
-
-post-install:
-	exec < ${LOCALBASE}/etc/xpdfrc; \
-		${RM} -f ${LOCALBASE}/etc/xpdfrc; \
-		( ${GREP} -v "${EXTRARC}"; \
-		  ${ECHO_CMD} "include ${EXTRARC}" ) \
-		> ${LOCALBASE}/etc/xpdfrc
-	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${LOCALBASE}/etc/xpdfrc
-	${CHMOD} 0444 ${LOCALBASE}/etc/xpdfrc
+	    ${INSTALL_DATA} ${INSTALL_FILES} ${STAGEDIR}${DATADIR}/japanese
+	${MKDIR} ${STAGEDIR}${DATADIR}/japanese/CMap
+	cd ${STAGEDIR}${DATADIR}/japanese/CMap && \
+	    ${FIND} ${ADOBECMAPDIR}/aj16/CMap ${ADOBECMAPDIR}/aj20/CMap \
+		-type f -exec ${LN} -s -f {} . \;
 
 .include <bsd.port.mk>

Modified: head/japanese/xpdf/pkg-plist
==============================================================================
--- head/japanese/xpdf/pkg-plist	Sat May 24 18:23:49 2014	(r355071)
+++ head/japanese/xpdf/pkg-plist	Sat May 24 18:29:07 2014	(r355072)
@@ -1,3 +1,4 @@
+ at comment $FreeBSD$
 %%DATADIR%%/japanese/Adobe-Japan1.cidToUnicode
 %%DATADIR%%/japanese/EUC-JP.unicodeMap
 %%DATADIR%%/japanese/ISO-2022-JP.unicodeMap

Modified: head/korean/xpdf/Makefile
==============================================================================
--- head/korean/xpdf/Makefile	Sat May 24 18:23:49 2014	(r355071)
+++ head/korean/xpdf/Makefile	Sat May 24 18:29:07 2014	(r355072)
@@ -28,23 +28,13 @@ ADOBECMAPDIR=	${LOCALBASE}/share/fonts/a
 INSTALL_FILES=	Adobe-Korea1.cidToUnicode ISO-2022-KR.unicodeMap \
 		README ../dot.xpdfrc
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/korean
+	${MKDIR} ${STAGEDIR}${DATADIR}/korean
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} ${INSTALL_FILES} ${DATADIR}/korean
-	${MKDIR} ${DATADIR}/korean/CMap
-	cd ${DATADIR}/korean/CMap && \
-		${FIND} ${ADOBECMAPDIR}/ak12/CMap \
-			-type f -exec ${LN} -s -f {} . \;
-
-post-install:
-	exec < ${LOCALBASE}/etc/xpdfrc; \
-		${RM} -f ${LOCALBASE}/etc/xpdfrc; \
-		( ${GREP} -v "${EXTRARC}"; \
-		  ${ECHO_CMD} "include ${EXTRARC}" ) \
-		> ${LOCALBASE}/etc/xpdfrc
-	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${LOCALBASE}/etc/xpdfrc
-	${CHMOD} 0444 ${LOCALBASE}/etc/xpdfrc
+	    ${INSTALL_DATA} ${INSTALL_FILES} ${STAGEDIR}${DATADIR}/korean
+	${MKDIR} ${STAGEDIR}${DATADIR}/korean/CMap
+	cd ${STAGEDIR}${DATADIR}/korean/CMap && \
+	    ${FIND} ${ADOBECMAPDIR}/ak12/CMap \
+		-type f -exec ${LN} -s -f {} . \;
 
 .include <bsd.port.mk>

Modified: head/korean/xpdf/pkg-plist
==============================================================================
--- head/korean/xpdf/pkg-plist	Sat May 24 18:23:49 2014	(r355071)
+++ head/korean/xpdf/pkg-plist	Sat May 24 18:29:07 2014	(r355072)
@@ -1,3 +1,4 @@
+ at comment $FreeBSD$
 %%DATADIR%%/korean/Adobe-Korea1.cidToUnicode
 %%DATADIR%%/korean/ISO-2022-KR.unicodeMap
 %%DATADIR%%/korean/README