Fix these ports so that among other things they look for the jx header

files in the correct place.

Submitted by:	maintainer

12 files changed, 127 insertions, 108 deletions

diff --git a/devel/codecrusader/Makefile b/devel/codecrusader/Makefile
index cb196648bf89..2431975d4adb 100644
--- a/devel/codecrusader/Makefile
+++ b/devel/codecrusader/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	code_crusader
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.newplanetsoftware.com/pub/jx/source-1.5.3/ \
 		ftp://ftp.newplanetsoftware.com/pub/jcc/source/ \
@@ -16,35 +17,32 @@ DISTNAME=	${PORTNAME}_source-${PORTVERSION}
 
 MAINTAINER=	lioux@linf.unb.br
 
-BUILD_DEPENDS=	nonexistent:${JXPORT}:patch
-LIB_DEPENDS=	jtoolbar-0_5_4.0:${PORTSDIR}/x11-toolkits/libjtoolbar
-RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
+BUILD_DEPENDS=	nonexistent:${JXPORT}:configure \
+		makemake:${JXPORT}
+LIB_DEPENDS=	jx-1_5_3.1:${JXPORT} \
+		jtoolbar-0_5_4.0:${PORTSDIR}/x11-toolkits/libjtoolbar \
+		jtree-1_1_7.1:${PORTSDIR}/x11-toolkits/libjtree
+RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags \
+		gmake:${PORTSDIR}/devel/gmake
 
 WRKSRC=		${WRKDIR}/JX-1.5.3
 
 USE_XLIB=	yes
-USE_BISON=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
-		JX_LIB_ROOT="${PREFIX}/lib" \
-		X11PREFIX="${X11PREFIX}" \
-		PORTCFLAGS="${CFLAGS}" \
-		PORTCXXFLAGS="${CXXFLAGS}" \
-		PORTINCLUDES="${PORTINCLUDES}" \
-		PORTLIBS="${PORTLIBS}"
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV=	JX_INSTALL_ROOT="${X11BASE}/bin" \
+		JX_LIB_ROOT="${X11BASE}/lib"
 PLIST_SUB=	PORTNAME="${PORTNAME}"
 
-# Proper X11R6 Prefix
-# Change it, if you need it
-X11PREFIX?=	${X11BASE}
-
 # Make environment
-PORTINCLUDES=	-I${LOCALBASE}/include -I${LOCALBASE}/include/jx \
-		-I${LOCALBASE}/include/jtoolbar \
-		-I${LOCALBASE}/include/jtree \
-		-I${LOCALBASE}/share/jx
-PORTLIBS=	-L${LOCALBASE}/lib
+PORTINCLUDES=	-I${X11BASE}/include -I${X11BASE}/include/jx \
+		-I${X11BASE}/include/jcore \
+		-I${X11BASE}/include/jtoolbar \
+		-I${X11BASE}/include/jtree \
+		-I${X11BASE}/share/jx
+PORTLIBS=	-L${X11BASE}/lib
 
 # Installs dir with proper permissions
 INSTALL_DATA_DIR=	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755
@@ -55,7 +53,8 @@ PROGRAMFILES_SCRIPT=	code_crusader/dirdiff
 DOCFILES=       FAQ LICENSE README.binary
 DOCDIR_PREFIX=  ${PREFIX}/share/doc/${PORTNAME}
 # additional configuration and header files
-EXTRALIB_PREFIX=	${PREFIX}/lib/jx
+EXTRALIB_PREFIX=	${X11BASE}/lib/jx
+EXTRALIBFILES_MAKE_WRKSRC=	include/make
 # examples
 EXAMPLEDIRS=		desktop macros
 EXAMPLEDIR_PREFIX=	${PREFIX}/share/examples/${PORTNAME}
@@ -63,7 +62,7 @@ EXAMPLEDIR_PREFIX=	${PREFIX}/share/examples/${PORTNAME}
 JXPORT=		${PORTSDIR}/x11-toolkits/jx
 JXPORT_WRKSRC=	${JXPORT}/work/JX-1.5.3
 # main jx distribution files needed for building
-COPY_JXDIRS=	include lib libjcore
+COPY_JXDIRS=	include
 COPY_JXFILES=	Makefile
 JX_MAKE_CONSTANTS=	jtoolbar_constants jtree_constants
 
@@ -89,6 +88,12 @@ post-extract:
 	@${CP} -p ${JXPORT_WRKSRC}/${i} ${WRKSRC}
 .endfor
 
+post-patch:
+	@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
+		${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
+	@${ECHO} "\nLOADLIBS += ${PORTLIBS}" >> \
+		${WRKSRC}/programs/${PORTNAME}/Make.header
+
 pre-build:
 .for i in ${JX_MAKE_CONSTANTS}
 	@${LN} -sf ${EXTRALIB_PREFIX}/make/${i} ${WRKSRC}/include/make
diff --git a/devel/codecrusader/files/patch-af b/devel/codecrusader/files/patch-af
index 2ea5a415eb43..18be5d2d2db3 100644
--- a/devel/codecrusader/files/patch-af
+++ b/devel/codecrusader/files/patch-af
@@ -1,9 +1,11 @@
---- Makefile.orig	Tue May 30 13:04:38 2000
-+++ Makefile	Tue May 30 13:09:41 2000
-@@ -264,11 +264,6 @@
+--- Makefile.orig	Sat Sep 11 17:44:38 1999
++++ Makefile	Wed Jun 14 01:07:15 2000
+@@ -262,25 +262,11 @@
+ freebsd2.x: prep
+ 	@ln -s sys/FreeBSD-2.x_g++ \
             include/make/jx_config
- 	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
-            include/jcore/jMissingProto.h
+-	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
+-           include/jcore/jMissingProto.h
 -	@ln -s config-freebsd.h \
 -           ACE/ACE_wrappers/ace/config.h
 -	@ln -s platform_freebsd.GNU \
@@ -12,10 +14,10 @@
  
  .PHONY : freebsd3.x
  freebsd3.x: prep
-@@ -276,11 +271,6 @@
+ 	@ln -s sys/FreeBSD-3.x_g++ \
             include/make/jx_config
- 	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
-            include/jcore/jMissingProto.h
+-	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
+-           include/jcore/jMissingProto.h
 -	@ln -s config-freebsd-pthread.h \
 -           ACE/ACE_wrappers/ace/config.h
 -	@ln -s platform_freebsd_pthread.GNU \
diff --git a/x11-toolkits/libjsearch/Makefile b/x11-toolkits/libjsearch/Makefile
index df273380e6a7..457ed1628ae2 100644
--- a/x11-toolkits/libjsearch/Makefile
+++ b/x11-toolkits/libjsearch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libjsearch
 PORTVERSION=	0.5.6
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.newplanetsoftware.com/pub/jx/source-1.5.3/ \
 		ftp://ftp.newplanetsoftware.com/pub/jcc/source/ \
@@ -16,32 +17,29 @@ DISTNAME=	JSearch_source-${PORTVERSION}
 
 MAINTAINER=	lioux@linf.unb.br
 
-BUILD_DEPENDS=	${NONEXISTENT}:${JXPORT}:patch
+BUILD_DEPENDS=	nonexistent:${JXPORT}:configure \
+		makemake:${JXPORT}
 LIB_DEPENDS=	jx-1_5_3.1:${JXPORT}
 
 WRKSRC=		${WRKDIR}/JX-1.5.3
 
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
-		JX_LIB_ROOT="${PREFIX}/lib" \
-		X11PREFIX="${X11PREFIX}" \
-		PORTCFLAGS="${CFLAGS}" \
-		PORTCXXFLAGS="${CXXFLAGS}" \
-		PORTINCLUDES="${PORTINCLUDES}"
+		JX_LIB_ROOT="${PREFIX}/lib"
 PLIST_SUB=	PORTNAME="${PORTNAME}" \
 		LIBNUMBER="${LIBNUMBER}" \
 		LIBVERSION="${LIBVERSION}" \
 		EXTRALIBFILES_MAKE_FILES="${EXTRALIBFILES_MAKE_FILES}" \
 		INCLUDEDIR="${INCLUDEDIR}"
-
-# Proper X11R6 Prefix
-# Change it, if you need it
-X11PREFIX?=	${X11BASE}
+INSTALLS_SHLIB=	yes
 
 # Make environment
-PORTINCLUDES=	-I${LOCALBASE}/include/jx -I${LOCALBASE}/share/jx
+PORTINCLUDES=	-I${X11BASE}/include/jx -I${X11BASE}/share/jx \
+		-I${X11BASE}/include/jcore
 
 # Installs dir with proper permissions
 INSTALL_DATA_DIR=	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755
@@ -52,7 +50,7 @@ LIBFILES=	${PORTNAME}-${LIBVERSION}.a ${PORTNAME}-${LIBVERSION}.so
 # header files
 INCLUDEDIR=	jsearch
 # documentation
-DOCDIR_PREFIX=	${PREFIX}/share/doc/JX
+DOCDIR_PREFIX=	${PREFIX}/share/doc/jx
 DOCDIRS=	${PORTNAME}
 DOCDIRFILES=	LICENSE
 # xpm images
@@ -70,7 +68,7 @@ EXTRALIBFILES_MAKE_FILES=	jsearch_constants
 JXPORT=		${PORTSDIR}/x11-toolkits/jx
 JXPORT_WRKSRC!=	cd ${JXPORT} && ${MAKE} -V WRKSRC
 # main jx distribution files needed for building
-COPY_JXDIRS=	include lib libjcore
+COPY_JXDIRS=	include
 COPY_JXFILES=	Makefile
 
 .if ${OSVERSION} >= 300000
@@ -95,9 +93,14 @@ post-extract:
 	@${CP} -p ${JXPORT_WRKSRC}/${i} ${WRKSRC}
 .endfor
 
+post-patch:
+	@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
+		${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
+
 post-build:
 	@cd ${WRKSRC}/${PORTNAME}; ${SETENV} ${MAKE_ENV} makemake; \
-		${SETENV} ${MAKE_ENV} ${GMAKE}
+		${SETENV} ${MAKE_ENV} ${GMAKE} \
+			${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 
 do-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/libjsearch/files/patch-aa b/x11-toolkits/libjsearch/files/patch-aa
index 2ea5a415eb43..18be5d2d2db3 100644
--- a/x11-toolkits/libjsearch/files/patch-aa
+++ b/x11-toolkits/libjsearch/files/patch-aa
@@ -1,9 +1,11 @@
---- Makefile.orig	Tue May 30 13:04:38 2000
-+++ Makefile	Tue May 30 13:09:41 2000
-@@ -264,11 +264,6 @@
+--- Makefile.orig	Sat Sep 11 17:44:38 1999
++++ Makefile	Wed Jun 14 01:07:15 2000
+@@ -262,25 +262,11 @@
+ freebsd2.x: prep
+ 	@ln -s sys/FreeBSD-2.x_g++ \
             include/make/jx_config
- 	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
-            include/jcore/jMissingProto.h
+-	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
+-           include/jcore/jMissingProto.h
 -	@ln -s config-freebsd.h \
 -           ACE/ACE_wrappers/ace/config.h
 -	@ln -s platform_freebsd.GNU \
@@ -12,10 +14,10 @@
  
  .PHONY : freebsd3.x
  freebsd3.x: prep
-@@ -276,11 +271,6 @@
+ 	@ln -s sys/FreeBSD-3.x_g++ \
             include/make/jx_config
- 	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
-            include/jcore/jMissingProto.h
+-	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
+-           include/jcore/jMissingProto.h
 -	@ln -s config-freebsd-pthread.h \
 -           ACE/ACE_wrappers/ace/config.h
 -	@ln -s platform_freebsd_pthread.GNU \
diff --git a/x11-toolkits/libjsearch/pkg-plist b/x11-toolkits/libjsearch/pkg-plist
index ace8f3407f98..b7c0e6990e2d 100644
--- a/x11-toolkits/libjsearch/pkg-plist
+++ b/x11-toolkits/libjsearch/pkg-plist
@@ -9,11 +9,11 @@ lib/jx/make/%%EXTRALIBFILES_MAKE_FILES%%
 lib/%%PORTNAME%%-%%LIBVERSION%%.a
 lib/%%PORTNAME%%-%%LIBVERSION%%.so
 lib/%%PORTNAME%%-%%LIBVERSION%%.so.%%LIBNUMBER%%
-%%PORTDOCS:%%share/doc/JX/LICENSE_%%PORTNAME%%
+%%PORTDOCS:%%share/doc/jx/LICENSE_%%PORTNAME%%
 share/jx/jsearch/find.xpm
 share/jx/jsearch/findnext.xpm
 share/jx/jsearch/findprev.xpm
 share/jx/jsearch/replace.xpm
 @dirrm share/jx/jsearch
-%%PORTDOCS:%%@unexec rmdir %D/share/doc/JX 2>/dev/null || true
+%%PORTDOCS:%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%
diff --git a/x11-toolkits/libjtoolbar/Makefile b/x11-toolkits/libjtoolbar/Makefile
index 95bda59224ca..987f68d421e6 100644
--- a/x11-toolkits/libjtoolbar/Makefile
+++ b/x11-toolkits/libjtoolbar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libjtoolbar
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.newplanetsoftware.com/pub/jx/source-1.5.3/ \
 		ftp://ftp.newplanetsoftware.com/pub/jcc/source/ \
@@ -16,33 +17,29 @@ DISTNAME=	JToolBar_source-${PORTVERSION}
 
 MAINTAINER=	lioux@linf.unb.br
 
-BUILD_DEPENDS=	nonexistent:${JXPORT}:patch
+BUILD_DEPENDS=	nonexistent:${JXPORT}:configure \
+		makemake:${JXPORT}
 LIB_DEPENDS=	jx-1_5_3.1:${JXPORT} \
 		jtree-1_1_7.1:${PORTSDIR}/x11-toolkits/libjtree
 
 WRKSRC=		${WRKDIR}/JX-1.5.3
 
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
-		JX_LIB_ROOT="${PREFIX}/lib" \
-		X11PREFIX="${X11PREFIX}" \
-		PORTCFLAGS="${CFLAGS}" \
-		PORTCXXFLAGS="${CXXFLAGS}" \
-		PORTINCLUDES="${PORTINCLUDES}"
+		JX_LIB_ROOT="${PREFIX}/lib"
 PLIST_SUB=	PORTNAME="${PORTNAME}" \
 		LIBNUMBER="${LIBNUMBER}" \
 		LIBVERSION="${LIBVERSION}" \
 		EXTRALIBFILES_MAKE_FILES="${EXTRALIBFILES_MAKE_FILES}" \
 		INCLUDEDIR="${INCLUDEDIR}"
-
-# Proper X11R6 Prefix
-# Change it, if you need it
-X11PREFIX?=	${X11BASE}
+INSTALLS_SHLIB=	yes
 
 # Make environment
-PORTINCLUDES=	-I${LOCALBASE}/include/jx -I${LOCALBASE}/include/jtree
+PORTINCLUDES=	-I${X11BASE}/include/jx -I${X11BASE}/include/jtree \
+		-I${X11BASE}/include/jcore
 
 # Installs dir with proper permissions
 INSTALL_DATA_DIR=	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755
@@ -53,7 +50,7 @@ LIBFILES=	${PORTNAME}-${LIBVERSION}.a ${PORTNAME}-${LIBVERSION}.so
 # header files
 INCLUDEDIR=	jtoolbar
 # documentation
-DOCDIR_PREFIX=	${PREFIX}/share/doc/JX
+DOCDIR_PREFIX=	${PREFIX}/share/doc/jx
 DOCDIRS=	${PORTNAME}
 DOCDIRFILES=	LICENSE
 # xpm images
@@ -68,7 +65,7 @@ EXTRALIBFILES_MAKE_FILES=	jtoolbar_constants
 JXPORT=		${PORTSDIR}/x11-toolkits/jx
 JXPORT_WRKSRC=	${JXPORT}/work/JX-1.5.3
 # main jx distribution files needed for building
-COPY_JXDIRS=		include lib libjcore
+COPY_JXDIRS=		include
 COPY_JXFILES=		Makefile
 JX_MAKE_CONSTANTS=	jtree_constants
 
@@ -96,6 +93,10 @@ post-extract:
 	@${CP} -p ${JXPORT_WRKSRC}/${i} ${WRKSRC}
 .endfor
 
+post-patch:
+	@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
+		${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
+
 pre-build:
 .for i in ${JX_MAKE_CONSTANTS}
 	@${LN} -sf ${EXTRALIB_PREFIX}/make/${i} ${WRKSRC}/include/make
@@ -103,7 +104,8 @@ pre-build:
 
 post-build:
 	@cd ${WRKSRC}/${PORTNAME}; ${SETENV} ${MAKE_ENV} makemake; \
-		${SETENV} ${MAKE_ENV} ${GMAKE}
+		${SETENV} ${MAKE_ENV} ${GMAKE} \
+			${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 
 do-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/libjtoolbar/files/patch-aa b/x11-toolkits/libjtoolbar/files/patch-aa
index 2ea5a415eb43..18be5d2d2db3 100644
--- a/x11-toolkits/libjtoolbar/files/patch-aa
+++ b/x11-toolkits/libjtoolbar/files/patch-aa
@@ -1,9 +1,11 @@
---- Makefile.orig	Tue May 30 13:04:38 2000
-+++ Makefile	Tue May 30 13:09:41 2000
-@@ -264,11 +264,6 @@
+--- Makefile.orig	Sat Sep 11 17:44:38 1999
++++ Makefile	Wed Jun 14 01:07:15 2000
+@@ -262,25 +262,11 @@
+ freebsd2.x: prep
+ 	@ln -s sys/FreeBSD-2.x_g++ \
             include/make/jx_config
- 	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
-            include/jcore/jMissingProto.h
+-	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
+-           include/jcore/jMissingProto.h
 -	@ln -s config-freebsd.h \
 -           ACE/ACE_wrappers/ace/config.h
 -	@ln -s platform_freebsd.GNU \
@@ -12,10 +14,10 @@
  
  .PHONY : freebsd3.x
  freebsd3.x: prep
-@@ -276,11 +271,6 @@
+ 	@ln -s sys/FreeBSD-3.x_g++ \
             include/make/jx_config
- 	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
-            include/jcore/jMissingProto.h
+-	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
+-           include/jcore/jMissingProto.h
 -	@ln -s config-freebsd-pthread.h \
 -           ACE/ACE_wrappers/ace/config.h
 -	@ln -s platform_freebsd_pthread.GNU \
diff --git a/x11-toolkits/libjtoolbar/pkg-comment b/x11-toolkits/libjtoolbar/pkg-comment
index ecbb1fd4e2d9..0bd6d5864bb4 100644
--- a/x11-toolkits/libjtoolbar/pkg-comment
+++ b/x11-toolkits/libjtoolbar/pkg-comment
@@ -1 +1 @@
-JToolBar is an additional library for the JX widget library
+An additional library for the JX widget library
diff --git a/x11-toolkits/libjtoolbar/pkg-plist b/x11-toolkits/libjtoolbar/pkg-plist
index 093616f248d0..d80c4813e75a 100644
--- a/x11-toolkits/libjtoolbar/pkg-plist
+++ b/x11-toolkits/libjtoolbar/pkg-plist
@@ -11,11 +11,11 @@ lib/jx/make/%%EXTRALIBFILES_MAKE_FILES%%
 lib/%%PORTNAME%%-%%LIBVERSION%%.a
 lib/%%PORTNAME%%-%%LIBVERSION%%.so
 lib/%%PORTNAME%%-%%LIBVERSION%%.so.%%LIBNUMBER%%
-%%PORTDOCS:%%share/doc/JX/LICENSE_%%PORTNAME%%
+%%PORTDOCS:%%share/doc/jx/LICENSE_%%PORTNAME%%
 share/jx/jtoolbar/itemchecked.xpm
 share/jx/jtoolbar/itemnotchecked.xpm
 share/jx/jtoolbar/menunode.xpm
 share/jx/jtoolbar/todonotdone.xpm
 @dirrm share/jx/jtoolbar
-%%PORTDOCS:%%@unexec rmdir %D/share/doc/JX 2>/dev/null || true
+%%PORTDOCS:%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%
diff --git a/x11-toolkits/libjtree/Makefile b/x11-toolkits/libjtree/Makefile
index 0fa988b6379e..cbbeaee75325 100644
--- a/x11-toolkits/libjtree/Makefile
+++ b/x11-toolkits/libjtree/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libjtree
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.newplanetsoftware.com/pub/jx/source-1.5.3/ \
 		ftp://ftp.newplanetsoftware.com/pub/jcc/source/ \
@@ -16,32 +17,27 @@ DISTNAME=	JTree_source-${PORTVERSION}
 
 MAINTAINER=	lioux@linf.unb.br
 
-BUILD_DEPENDS=	/nonexistent:${JXPORT}:patch
+BUILD_DEPENDS=	nonexistent:${JXPORT}:configure \
+		makemake:${JXPORT}
 LIB_DEPENDS=	jx-1_5_3.1:${JXPORT}
 
 WRKSRC=		${WRKDIR}/JX-1.5.3
 
-USE_XLIB=	yes
-INSTALLS_SHLIB=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
-		JX_LIB_ROOT="${PREFIX}/lib" \
-		X11PREFIX="${X11PREFIX}" \
-		PORTCFLAGS="${CFLAGS}" \
-		PORTCXXFLAGS="${CXXFLAGS}" \
-		PORTINCLUDES="${PORTINCLUDES}"
+		JX_LIB_ROOT="${PREFIX}/lib"
 PLIST_SUB=	PORTNAME="${PORTNAME}" \
 		LIBNUMBER="${LIBNUMBER}" \
 		LIBVERSION="${LIBVERSION}" \
 		EXTRALIBFILES_MAKE_FILES="${EXTRALIBFILES_MAKE_FILES}" \
 		INCLUDEDIR="${INCLUDEDIR}"
-
-# Proper X11R6 Prefix
-# Change it, if you need it
-X11PREFIX?=	${X11BASE}
+INSTALLS_SHLIB=	yes
 
 # Make environment
-PORTINCLUDES=	-I${LOCALBASE}/include/jx
+PORTINCLUDES=	-I${X11BASE}/include/jx -I${X11BASE}/include/jcore
 
 # Installs dir with proper permissions
 INSTALL_DATA_DIR=	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755
@@ -52,7 +48,7 @@ LIBFILES=	${PORTNAME}-${LIBVERSION}.a ${PORTNAME}-${LIBVERSION}.so
 # header files
 INCLUDEDIR=	jtree
 # documentation
-DOCDIR_PREFIX=	${PREFIX}/share/doc/JX
+DOCDIR_PREFIX=	${PREFIX}/share/doc/jx
 DOCDIRS=	${PORTNAME}
 DOCDIRFILES=	LICENSE
 # additional configuration and header files
@@ -64,7 +60,7 @@ EXTRALIBFILES_MAKE_FILES=	jtree_constants
 JXPORT=		${PORTSDIR}/x11-toolkits/jx
 JXPORT_WRKSRC=	${JXPORT}/work/JX-1.5.3
 # main jx distribution files needed for building
-COPY_JXDIRS=	include lib libjcore
+COPY_JXDIRS=	include
 COPY_JXFILES=	Makefile
 
 .include <bsd.port.pre.mk>
@@ -91,9 +87,14 @@ post-extract:
 	@${CP} -p ${JXPORT_WRKSRC}/${i} ${WRKSRC}
 .endfor
 
+post-patch:
+	@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
+		${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
+
 post-build:
 	@cd ${WRKSRC}/${PORTNAME}; ${SETENV} ${MAKE_ENV} makemake; \
-		${SETENV} ${MAKE_ENV} ${GMAKE}
+		${SETENV} ${MAKE_ENV} ${GMAKE} \
+			${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 
 do-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/libjtree/files/patch-aa b/x11-toolkits/libjtree/files/patch-aa
index 2ea5a415eb43..18be5d2d2db3 100644
--- a/x11-toolkits/libjtree/files/patch-aa
+++ b/x11-toolkits/libjtree/files/patch-aa
@@ -1,9 +1,11 @@
---- Makefile.orig	Tue May 30 13:04:38 2000
-+++ Makefile	Tue May 30 13:09:41 2000
-@@ -264,11 +264,6 @@
+--- Makefile.orig	Sat Sep 11 17:44:38 1999
++++ Makefile	Wed Jun 14 01:07:15 2000
+@@ -262,25 +262,11 @@
+ freebsd2.x: prep
+ 	@ln -s sys/FreeBSD-2.x_g++ \
             include/make/jx_config
- 	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
-            include/jcore/jMissingProto.h
+-	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
+-           include/jcore/jMissingProto.h
 -	@ln -s config-freebsd.h \
 -           ACE/ACE_wrappers/ace/config.h
 -	@ln -s platform_freebsd.GNU \
@@ -12,10 +14,10 @@
  
  .PHONY : freebsd3.x
  freebsd3.x: prep
-@@ -276,11 +271,6 @@
+ 	@ln -s sys/FreeBSD-3.x_g++ \
             include/make/jx_config
- 	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
-            include/jcore/jMissingProto.h
+-	@ln -s ../../include/missing_proto/jMissingProto_empty.h \
+-           include/jcore/jMissingProto.h
 -	@ln -s config-freebsd-pthread.h \
 -           ACE/ACE_wrappers/ace/config.h
 -	@ln -s platform_freebsd_pthread.GNU \
diff --git a/x11-toolkits/libjtree/pkg-plist b/x11-toolkits/libjtree/pkg-plist
index 2e3c3e444b8b..ea0b0c7bacd4 100644
--- a/x11-toolkits/libjtree/pkg-plist
+++ b/x11-toolkits/libjtree/pkg-plist
@@ -13,6 +13,6 @@ lib/jx/make/%%EXTRALIBFILES_MAKE_FILES%%
 lib/%%PORTNAME%%-%%LIBVERSION%%.a
 lib/%%PORTNAME%%-%%LIBVERSION%%.so
 lib/%%PORTNAME%%-%%LIBVERSION%%.so.%%LIBNUMBER%%
-%%PORTDOCS:%%share/doc/JX/LICENSE_%%PORTNAME%%
-%%PORTDOCS:%%@unexec rmdir %D/share/doc/JX 2>/dev/null || true
+%%PORTDOCS:%%share/doc/jx/LICENSE_%%PORTNAME%%
+%%PORTDOCS:%%@unexec rmdir %D/share/doc/jx 2>/dev/null || true
 @dirrm include/%%INCLUDEDIR%%