Approved by: Will

Some simple changes. Mostly implementing Mr. Sada Kenji patches to
JX x11-toolkit family ports:

   1. nonexistent -> ${NONEXISTENT}
   2. Allow you to define WRKDIRPREFIX safely.

   -JXPORT_WRKSRC= ${JXPORT}/work/JX-1.5.3
   +JXPORT_WRKSRC!=        cd ${JXPORT} && ${MAKE} -V WRKSRC

5 files changed, 23 insertions, 21 deletions

diff --git a/x11-toolkits/libj2dplot/Makefile b/x11-toolkits/libj2dplot/Makefile
index 10a1b411cc8c..cc001b7a36af 100644
--- a/x11-toolkits/libj2dplot/Makefile
+++ b/x11-toolkits/libj2dplot/Makefile
@@ -14,15 +14,13 @@ DISTNAME=	J2DPlot_source-${PORTVERSION}
 
 MAINTAINER=	lioux@linf.unb.br
 
-BUILD_DEPENDS=	nonexistent:${JXPORT}:configure \
+BUILD_DEPENDS=	${NONEXISTENT}:${JXPORT}:configure \
 		makemake:${JXPORT}
 LIB_DEPENDS=	jx-1_5_3.1:${JXPORT} \
 		jparser-1_1_8.1:${PORTSDIR}/x11-toolkits/libjparser
 
 WRKSRC=		${WRKDIR}/JX-1.5.3
 
-INSTALLS_SHLIB=	yes
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" CXX="${CXX}" \
@@ -34,6 +32,7 @@ PLIST_SUB=	PORTNAME="${PORTNAME}" \
 		LIBVERSION="${LIBVERSION}" \
 		EXTRALIBFILES_MAKE_FILES="${EXTRALIBFILES_MAKE_FILES}" \
 		INCLUDEDIR="${INCLUDEDIR}"
+INSTALLS_SHLIB=	yes
 
 # Make environment
 PORTINCLUDES=	-I${X11BASE}/include/jcore -I${X11BASE}/include/jx \
@@ -56,15 +55,16 @@ EXTRALIB_PREFIX=		${PREFIX}/lib/jx
 EXTRALIBDIRS=			lib make
 EXTRALIBFILES_MAKE_WRKSRC=	include/make
 EXTRALIBFILES_MAKE_FILES=	j2dplot_constants
+
+.include <bsd.port.pre.mk>
+
 # main jx distribution port wrksrc
 JXPORT=		${PORTSDIR}/x11-toolkits/jx
-JXPORT_WRKSRC=	${JXPORT}/work/JX-1.5.3
+JXPORT_WRKSRC!=	cd ${JXPORT} && ${MAKE} -V WRKSRC
 # main jx distribution files needed for building
 COPY_JXDIRS=		include
 COPY_JXFILES=		Makefile
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 LIBNUMBER=	0
diff --git a/x11-toolkits/libjparser/Makefile b/x11-toolkits/libjparser/Makefile
index 71310a80cda0..9812d1a15ce9 100644
--- a/x11-toolkits/libjparser/Makefile
+++ b/x11-toolkits/libjparser/Makefile
@@ -14,14 +14,12 @@ DISTNAME=	JParser_source-${PORTVERSION}
 
 MAINTAINER=	lioux@linf.unb.br
 
-BUILD_DEPENDS=	nonexistent:${JXPORT}:configure \
+BUILD_DEPENDS=	${NONEXISTENT}:${JXPORT}:configure \
 		makemake:${JXPORT}
 LIB_DEPENDS=	jx-1_5_3.1:${JXPORT}
 
 WRKSRC=		${WRKDIR}/JX-1.5.3
 
-INSTALLS_SHLIB=	yes
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" CXX="${CXX}" \
@@ -33,6 +31,7 @@ PLIST_SUB=	PORTNAME="${PORTNAME}" \
 		LIBVERSION="${LIBVERSION}" \
 		EXTRALIBFILES_MAKE_FILES="${EXTRALIBFILES_MAKE_FILES}" \
 		INCLUDEDIR="${INCLUDEDIR}"
+INSTALLS_SHLIB=	yes
 
 # Make environment
 PORTINCLUDES=	-I${X11BASE}/include/jcore -I${X11BASE}/include/jx \
@@ -55,15 +54,16 @@ EXTRALIB_PREFIX=		${PREFIX}/lib/jx
 EXTRALIBDIRS=			lib make
 EXTRALIBFILES_MAKE_WRKSRC=	include/make
 EXTRALIBFILES_MAKE_FILES=	jparser_constants
+
+.include <bsd.port.pre.mk>
+
 # main jx distribution port wrksrc
 JXPORT=		${PORTSDIR}/x11-toolkits/jx
-JXPORT_WRKSRC=	${JXPORT}/work/JX-1.5.3
+JXPORT_WRKSRC!=	cd ${JXPORT} && ${MAKE} -V WRKSRC
 # main jx distribution files needed for building
 COPY_JXDIRS=		include
 COPY_JXFILES=		Makefile
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 LIBNUMBER=	1
diff --git a/x11-toolkits/libjsearch/Makefile b/x11-toolkits/libjsearch/Makefile
index 457ed1628ae2..3c2e4b5ca58f 100644
--- a/x11-toolkits/libjsearch/Makefile
+++ b/x11-toolkits/libjsearch/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	JSearch_source-${PORTVERSION}
 
 MAINTAINER=	lioux@linf.unb.br
 
-BUILD_DEPENDS=	nonexistent:${JXPORT}:configure \
+BUILD_DEPENDS=	${NONEXISTENT}:${JXPORT}:configure \
 		makemake:${JXPORT}
 LIB_DEPENDS=	jx-1_5_3.1:${JXPORT}
 
diff --git a/x11-toolkits/libjtoolbar/Makefile b/x11-toolkits/libjtoolbar/Makefile
index 987f68d421e6..84df63a8caf9 100644
--- a/x11-toolkits/libjtoolbar/Makefile
+++ b/x11-toolkits/libjtoolbar/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	JToolBar_source-${PORTVERSION}
 
 MAINTAINER=	lioux@linf.unb.br
 
-BUILD_DEPENDS=	nonexistent:${JXPORT}:configure \
+BUILD_DEPENDS=	${NONEXISTENT}:${JXPORT}:configure \
 		makemake:${JXPORT}
 LIB_DEPENDS=	jx-1_5_3.1:${JXPORT} \
 		jtree-1_1_7.1:${PORTSDIR}/x11-toolkits/libjtree
@@ -61,16 +61,17 @@ EXTRALIB_PREFIX=		${PREFIX}/lib/jx
 EXTRALIBDIRS=			lib make
 EXTRALIBFILES_MAKE_WRKSRC=	include/make
 EXTRALIBFILES_MAKE_FILES=	jtoolbar_constants
+
+.include <bsd.port.pre.mk>
+
 # main jx distribution port wrksrc
 JXPORT=		${PORTSDIR}/x11-toolkits/jx
-JXPORT_WRKSRC=	${JXPORT}/work/JX-1.5.3
+JXPORT_WRKSRC!=	cd ${JXPORT} && ${MAKE} -V WRKSRC
 # main jx distribution files needed for building
 COPY_JXDIRS=		include
 COPY_JXFILES=		Makefile
 JX_MAKE_CONSTANTS=	jtree_constants
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 LIBNUMBER=	0
diff --git a/x11-toolkits/libjtree/Makefile b/x11-toolkits/libjtree/Makefile
index cbbeaee75325..c641123de4d9 100644
--- a/x11-toolkits/libjtree/Makefile
+++ b/x11-toolkits/libjtree/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	JTree_source-${PORTVERSION}
 
 MAINTAINER=	lioux@linf.unb.br
 
-BUILD_DEPENDS=	nonexistent:${JXPORT}:configure \
+BUILD_DEPENDS=	${NONEXISTENT}:${JXPORT}:configure \
 		makemake:${JXPORT}
 LIB_DEPENDS=	jx-1_5_3.1:${JXPORT}
 
@@ -56,15 +56,16 @@ EXTRALIB_PREFIX=		${PREFIX}/lib/jx
 EXTRALIBDIRS=			lib make
 EXTRALIBFILES_MAKE_WRKSRC=	include/make
 EXTRALIBFILES_MAKE_FILES=	jtree_constants
+
+.include <bsd.port.pre.mk>
+
 # main jx distribution port wrksrc
 JXPORT=		${PORTSDIR}/x11-toolkits/jx
-JXPORT_WRKSRC=	${JXPORT}/work/JX-1.5.3
+JXPORT_WRKSRC!=	cd ${JXPORT} && ${MAKE} -V WRKSRC
 # main jx distribution files needed for building
 COPY_JXDIRS=	include
 COPY_JXFILES=	Makefile
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 LIBNUMBER=	1