Stage japanese/xdtp

PR:		192802
Submitted by:	Ports Fury

2 files changed, 93 insertions, 79 deletions

diff --git a/japanese/xdtp/Makefile b/japanese/xdtp/Makefile
index 0f6a1343c791..bf39565ea917 100644
--- a/japanese/xdtp/Makefile
+++ b/japanese/xdtp/Makefile
@@ -3,57 +3,71 @@
 
 PORTNAME=	xdtp
 PORTVERSION=	1.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.ongs.co.jp/software/xdtp/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML document transfer program
 
-LICENSE=	BSD
-
-LIB_DEPENDS=	libglibmm-2.4.so:${PORTSDIR}/devel/glibmm
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		pkgconfig tar:tgz
+USE_GNOME=	glibmm libxml2 libxslt
+HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	libxml2 libxslt
-GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	GDK DEBUG INCLUDE
-GDK_DESC=	Build with Gdk-Pixbuf
-INCLUDE_DESC=	Install with XDTP include files
+CFLAGS+=	-fPIC
 
+OPTIONS_DEFINE=		DEBUG DOCS GDK INCLUDE
 OPTIONS_DEFAULT=	GDK INCLUDE
+OPTIONS_SUB=		yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == "amd64"
-CFLAGS+=	-fPIC
-.endif
-
-.if ${PORT_OPTIONS:MGDK}
-USE_GNOME+=	gtk20
-.else
-CONFIGURE_ENV+=	WITHOUT_GDK="yes"
-MAKE_ARGS+=	-DWITHOUT_GDK
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-MAKE_ARGS+=	-DDEBUG
-.endif
-
-.if ${PORT_OPTIONS:MINCLUDE}
-PLIST_SUB+=	XDTP_INC=""
-.else
-MAKE_ARGS+=	-DWITHOUT_INCLUDE
-PLIST_SUB+=	XDTP_INC="@comment "
-.endif
+DEBUG_MAKE_ARGS=	DEBUG="yes"
+GDK_DESC=		Build with Gdk-Pixbuf
+GDK_USE=		gnome=gdkpixbuf2
+GDK_CONFIGURE_ENV_OFF=	WITHOUT_GDK="yes"
+GDK_MAKE_ARGS_OFF=	WITHOUT_GDK="yes"
+INCLUDE_DESC=		Install with XDTP include files
+INCLUDE_MAKE_ARGS_OFF=	WITHOUT_INCLUDE="yes"
 
-# Unbreak parallel builds (-jX) by calling make(1) correctly
 post-patch:
+	@${REINPLACE_CMD} -e \
+		's|-o .* \(-m\)|\1| ; \
+		 s|\([[:blank:]]\)\($${XDTPDOCUMENT}\)|\1$${DESTDIR}\2|' \
+		${WRKSRC}/banbun/Makefile
+	@${REINPLACE_CMD} -e \
+		's|-o .* \(-m\)|\1| ; \
+		 s|\([[:blank:]]\)\($${PREFIX}\)|\1$${DESTDIR}\2|' \
+		${WRKSRC}/bin/Makefile
+	@${REINPLACE_CMD} -e \
+		's|-o .* \(-m\)|\1| ; \
+		 s|\([[:blank:]]\)\($${XDTPSHARE}\)|\1$${DESTDIR}\2|' \
+		${WRKSRC}/misc/emacs/Makefile
+	@${REINPLACE_CMD} -e \
+		's|-o .* \(-m\)|\1| ; \
+		 s|\([[:blank:]]\)\($${PKGCONFDIR}\)|\1$${DESTDIR}\2|' \
+		${WRKSRC}/pkgconfig/Makefile
+	@${REINPLACE_CMD} -e \
+		's|-o .* \(-m\)|\1| ; \
+		 s|\([[:blank:]]\)\($${PREFIX}\)|\1$${DESTDIR}\2| ; \
+		 s|\([[:blank:]]\)\($${XDTPINCLUDE}\)|\1$${DESTDIR}\2| ; \
+		 s|\([[:blank:]]\)\($${XDTPSHARE}\)|\1$${DESTDIR}\2| ; \
+		 /$${LN}/s|^|#|' \
+		${WRKSRC}/src/Makefile
+	@${REINPLACE_CMD} -e \
+		's|-o .* \(-m\)|\1| ; \
+		 s|\([[:blank:]]\)\($${PREFIX}\)|\1$${DESTDIR}\2| ; \
+		 s|\([[:blank:]]\)\($${XDTPSHARE}\)|\1$${DESTDIR}\2|' \
+		${WRKSRC}/xsl/Makefile
+# Unbreak parallel builds (-jX) by calling make(1) correctly
 	@${REINPLACE_CMD} -E 's/cd(.+)(;| &&) (\$${MAKE})/\3 -C\1/' \
 		${WRKSRC}/Makefile ${WRKSRC}/bin/Makefile \
 		${WRKSRC}/java/Makefile ${WRKSRC}/misc/Makefile
 
+post-install:
+	@${LN} -sf libxdtp.so.5 ${STAGEDIR}${PREFIX}/lib/libxdtp.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxdtp.so.5
+
 .include <bsd.port.mk>
diff --git a/japanese/xdtp/pkg-plist b/japanese/xdtp/pkg-plist
index be82aa728f56..71d27946358a 100644
--- a/japanese/xdtp/pkg-plist
+++ b/japanese/xdtp/pkg-plist
@@ -1,18 +1,48 @@
-bin/xdtp
 bin/banbun2html
 bin/banbun2text
 bin/banbun2xhtml
 bin/glsd-doc2html
 bin/glsd-doc2text
+bin/xdtp
+%%INCLUDE%%include/xdtp/CSVAnalyzer.h
+%%INCLUDE%%include/xdtp/Exception.h
+%%INCLUDE%%include/xdtp/RefPtr.h
+%%INCLUDE%%include/xdtp/URI.h
+%%INCLUDE%%include/xdtp/URLTool.h
+%%INCLUDE%%include/xdtp/Utilities.h
+%%INCLUDE%%include/xdtp/XDTPObjectWrapper.h
+%%INCLUDE%%include/xdtp/XDTPTransform.h
+%%INCLUDE%%include/xdtp/XMLTool.h
+%%INCLUDE%%include/xdtp/modules/GLSDBanBunModule.h
+%%INCLUDE%%include/xdtp/modules/GLSDBanBunModuleChecker.h
+%%INCLUDE%%include/xdtp/modules/GLSDDocumentModule.h
+%%INCLUDE%%include/xdtp/modules/GLSDDocumentModuleChecker.h
+%%INCLUDE%%include/xdtp/modules/GLSDModule.h
+%%INCLUDE%%include/xdtp/modules/GLSDModuleChecker.h
+%%INCLUDE%%include/xdtp/modules/XDTPChecker.h
+%%INCLUDE%%include/xdtp/modules/XDTPModule.h
+%%INCLUDE%%include/xdtp/modules/XDTPModuleAdapter.h
+%%INCLUDE%%include/xdtp/modules/XDTPModuleLoader.h
+%%INCLUDE%%include/xdtp/modules/imports/GLSDImportModule.h
+%%INCLUDE%%include/xdtp/modules/imports/GLSDImportModuleAdapter.h
+%%INCLUDE%%include/xdtp/modules/imports/ImportImage.h
+%%INCLUDE%%include/xdtp/modules/imports/ImportTextCSV.h
+%%INCLUDE%%include/xdtp/modules/imports/ImportTextCommandPrompt.h
+%%INCLUDE%%include/xdtp/modules/imports/ImportTextGLSD.h
+%%INCLUDE%%include/xdtp/modules/imports/ImportTextPlain.h
+%%INCLUDE%%include/xdtp/modules/imports/ImportTextSourcecode.h
+%%INCLUDE%%include/xdtp/modules/imports/ImportTextXML.h
+%%INCLUDE%%include/xdtp/xdtptypes.h
+%%INCLUDE%%include/xdtp/xmlloader.h
+%%INCLUDE%%include/xdtp/xmlsaver.h
+lib/libxdtp.a
 lib/libxdtp.so
 lib/libxdtp.so.5
-lib/libxdtp.a
 libdata/pkgconfig/libxdtp.pc
-%%DOCSDIR%%/banbun-0001.html
-%%DOCSDIR%%/banbun-0002.html
-%%DOCSDIR%%/banbun-0003.html
-%%DOCSDIR%%/banbun-0004.html
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/banbun-0001.html
+%%PORTDOCS%%%%DOCSDIR%%/banbun-0002.html
+%%PORTDOCS%%%%DOCSDIR%%/banbun-0003.html
+%%PORTDOCS%%%%DOCSDIR%%/banbun-0004.html
 %%DATADIR%%/emacs/hanbun.el
 %%DATADIR%%/toHTML/BanBun.xsl
 %%DATADIR%%/toHTML/BanBunModule.xsl
@@ -29,42 +59,12 @@ libdata/pkgconfig/libxdtp.pc
 %%DATADIR%%/toXHTML/DocumentModule.xsl
 %%DATADIR%%/toXHTML/GLSD.xsl
 %%DATADIR%%/toXHTML/GLSDocumentModule.xsl
-@dirrm %%DATADIR%%/emacs
-@dirrm %%DATADIR%%/toHTML
-@dirrm %%DATADIR%%/toTEXT
 @dirrm %%DATADIR%%/toXHTML
-@dirrmtry %%DATADIR%%
-%%XDTP_INC%%include/xdtp/CSVAnalyzer.h
-%%XDTP_INC%%include/xdtp/Exception.h
-%%XDTP_INC%%include/xdtp/RefPtr.h
-%%XDTP_INC%%include/xdtp/URI.h
-%%XDTP_INC%%include/xdtp/URLTool.h
-%%XDTP_INC%%include/xdtp/Utilities.h
-%%XDTP_INC%%include/xdtp/XDTPObjectWrapper.h
-%%XDTP_INC%%include/xdtp/XDTPTransform.h
-%%XDTP_INC%%include/xdtp/XMLTool.h
-%%XDTP_INC%%include/xdtp/xdtptypes.h
-%%XDTP_INC%%include/xdtp/xmlloader.h
-%%XDTP_INC%%include/xdtp/xmlsaver.h
-%%XDTP_INC%%include/xdtp/modules/GLSDBanBunModule.h
-%%XDTP_INC%%include/xdtp/modules/GLSDBanBunModuleChecker.h
-%%XDTP_INC%%include/xdtp/modules/GLSDDocumentModule.h
-%%XDTP_INC%%include/xdtp/modules/GLSDDocumentModuleChecker.h
-%%XDTP_INC%%include/xdtp/modules/GLSDModule.h
-%%XDTP_INC%%include/xdtp/modules/GLSDModuleChecker.h
-%%XDTP_INC%%include/xdtp/modules/XDTPChecker.h
-%%XDTP_INC%%include/xdtp/modules/XDTPModule.h
-%%XDTP_INC%%include/xdtp/modules/XDTPModuleAdapter.h
-%%XDTP_INC%%include/xdtp/modules/XDTPModuleLoader.h
-%%XDTP_INC%%include/xdtp/modules/imports/GLSDImportModule.h
-%%XDTP_INC%%include/xdtp/modules/imports/GLSDImportModuleAdapter.h
-%%XDTP_INC%%include/xdtp/modules/imports/ImportImage.h
-%%XDTP_INC%%include/xdtp/modules/imports/ImportTextCSV.h
-%%XDTP_INC%%include/xdtp/modules/imports/ImportTextCommandPrompt.h
-%%XDTP_INC%%include/xdtp/modules/imports/ImportTextGLSD.h
-%%XDTP_INC%%include/xdtp/modules/imports/ImportTextPlain.h
-%%XDTP_INC%%include/xdtp/modules/imports/ImportTextSourcecode.h
-%%XDTP_INC%%include/xdtp/modules/imports/ImportTextXML.h
-%%XDTP_INC%%@dirrm include/xdtp/modules/imports
-%%XDTP_INC%%@dirrm include/xdtp/modules
-%%XDTP_INC%%@dirrm include/xdtp
+@dirrm %%DATADIR%%/toTEXT
+@dirrm %%DATADIR%%/toHTML
+@dirrm %%DATADIR%%/emacs
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%INCLUDE%%@dirrm include/xdtp/modules/imports
+%%INCLUDE%%@dirrm include/xdtp/modules
+%%INCLUDE%%@dirrm include/xdtp