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

12 files changed, 58 insertions, 49 deletions

diff --git a/deskutils/notebook/Makefile b/deskutils/notebook/Makefile
index 569ca15..1cc2e63 100644
--- a/deskutils/notebook/Makefile
+++ b/deskutils/notebook/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	Notebook_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} \
 		jtoolbar-0_5_4.0:${PORTSDIR}/x11-toolkits/libjtoolbar \
@@ -48,13 +48,14 @@ EXTRALIBFILES_MAKE_WRKSRC=	include/make
 # main jx distribution files needed for building
 COPY_JXDIRS=	include
 COPY_JXFILES=	Makefile
+
+.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
 JX_MAKE_CONSTANTS=	jtoolbar_constants jtree_constants
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 .else
diff --git a/devel/codecrusader/Makefile b/devel/codecrusader/Makefile
index 2431975..4b33597 100644
--- a/devel/codecrusader/Makefile
+++ b/devel/codecrusader/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}_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} \
 		jtoolbar-0_5_4.0:${PORTSDIR}/x11-toolkits/libjtoolbar \
@@ -58,16 +58,17 @@ EXTRALIBFILES_MAKE_WRKSRC=	include/make
 # examples
 EXAMPLEDIRS=		desktop macros
 EXAMPLEDIR_PREFIX=	${PREFIX}/share/examples/${PORTNAME}
+
+.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=	jtoolbar_constants jtree_constants
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 .else
diff --git a/devel/codemedic/Makefile b/devel/codemedic/Makefile
index 43f2c13..88a8a56 100644
--- a/devel/codemedic/Makefile
+++ b/devel/codemedic/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	Code_Medic_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} \
 		jsearch-0_5_6.0:${PORTSDIR}/x11-toolkits/libjsearch \
@@ -49,16 +49,17 @@ DOCDIR_PREFIX=  ${PREFIX}/share/doc/${PORTNAME}
 # additional configuration and header files
 EXTRALIB_PREFIX=	${X11BASE}/lib/jx
 EXTRALIBFILES_MAKE_WRKSRC=	include/make
+
+.include <bsd.port.pre.mk>
+
 # main jx distribution files needed for building
 COPY_JXDIRS=	include
 COPY_JXFILES=	Makefile
 # 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
 JX_MAKE_CONSTANTS=	jsearch_constants jtree_constants
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 .else
diff --git a/mail/arrow/Makefile b/mail/arrow/Makefile
index 0ab8e91..1861397 100644
--- a/mail/arrow/Makefile
+++ b/mail/arrow/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	Arrow_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} \
 		jsearch-0_5_6.0:${PORTSDIR}/x11-toolkits/libjsearch \
@@ -51,13 +51,14 @@ EXTRALIBFILES_MAKE_WRKSRC=	include/make
 # main jx distribution files needed for building
 COPY_JXDIRS=	include
 COPY_JXFILES=	Makefile
+
+.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
 JX_MAKE_CONSTANTS=	jsearch_constants jtoolbar_constants jtree_constants
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 .else
diff --git a/math/glove/Makefile b/math/glove/Makefile
index f0e62ab..138a8d4 100644
--- a/math/glove/Makefile
+++ b/math/glove/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	Glove_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} \
 		j2dplot-0_6_5.0:${PORTSDIR}/x11-toolkits/libj2dplot \
@@ -48,13 +48,14 @@ EXTRALIBFILES_MAKE_WRKSRC=	include/make
 # main jx distribution files needed for building
 COPY_JXDIRS=	include
 COPY_JXFILES=	Makefile
+
+.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
 JX_MAKE_CONSTANTS=	j2dplot_constants jparser_constants
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 .else
diff --git a/math/thx_1138/Makefile b/math/thx_1138/Makefile
index f466a5d..b2743f1 100644
--- a/math/thx_1138/Makefile
+++ b/math/thx_1138/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME:S,_,-,}_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} \
 		j2dplot-0_6_5.0:${PORTSDIR}/x11-toolkits/libj2dplot \
@@ -49,13 +49,14 @@ EXTRALIBFILES_MAKE_WRKSRC=	include/make
 # main jx distribution files needed for building
 COPY_JXDIRS=	include
 COPY_JXFILES=	Makefile
+
+.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
 JX_MAKE_CONSTANTS=	j2dplot_constants jparser_constants
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 .else
diff --git a/x11-fm/systemg/Makefile b/x11-fm/systemg/Makefile
index 7ea5ed4..27afaff 100644
--- a/x11-fm/systemg/Makefile
+++ b/x11-fm/systemg/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	SystemG_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} \
 		jtoolbar-0_5_4.0:${PORTSDIR}/x11-toolkits/libjtoolbar \
@@ -46,13 +46,14 @@ EXTRALIBFILES_MAKE_WRKSRC=	include/make
 # main jx distribution files needed for building
 COPY_JXDIRS=	include
 COPY_JXFILES=	Makefile
+
+.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
 JX_MAKE_CONSTANTS=	jtoolbar_constants jtree_constants
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 300000
 ALL_TARGET=	freebsd3.x
 .else
diff --git a/x11-toolkits/libj2dplot/Makefile b/x11-toolkits/libj2dplot/Makefile
index 10a1b41..cc001b7 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 71310a8..9812d1a 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 457ed16..3c2e4b5 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 987f68d..84df63a 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 cbbeaee..c641123 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