- Conform to GNOME directory hierarchy

- Support CFLAGS properly

PR:		38782

4 files changed, 26 insertions, 41 deletions

diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile
index 69846110baa7..8e366b464dc5 100644
--- a/ftp/junglemonkey/Makefile
+++ b/ftp/junglemonkey/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	junglemonkey
 PORTVERSION=	0.1.11
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	ftp gnome
 MASTER_SITES=	http://www.junglemonkey.net/src/
 DISTNAME=	jm-${PORTVERSION}
@@ -16,24 +16,22 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gnet.0:${PORTSDIR}/net/gnet
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-gnome
+CONFIGURE_ARGS=	--enable-gnome=yes --enable-debug=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		jm.1 jmlite.1 mtprendezvous.1
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|/gnome/help/|/help/|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
-post-install:
-	@${RMDIR} ${X11BASE}/share/gnome/help/jm/C/stylesheet-images
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/ftp/junglemonkey/files/patch-aa b/ftp/junglemonkey/files/patch-aa
deleted file mode 100644
index a783c73d3faa..000000000000
--- a/ftp/junglemonkey/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Thu May 11 14:13:48 2000
-+++ configure	Thu May 18 10:47:51 2000
-@@ -4706,7 +4706,7 @@
- 		    JM_GLADE_FILE="jm-gnome.glade"
- 		    JM_GNOME_PIXMAP_FILE="jm-logo.png"
- 		    JM_GNOME_DESKTOP_FILE="jm.desktop"
--		    JM_HELPDIR="/gnome/help/jm/C"
-+		    JM_HELPDIR="/help/jm/C"
- 		  
-         	else
- 	    		if test "x$withval" = xno; then
-@@ -4930,7 +4930,7 @@
- 		    JM_GLADE_FILE="jm-gnome.glade"
- 		    JM_GNOME_PIXMAP_FILE="jm-logo.png"
- 		    JM_GNOME_DESKTOP_FILE="jm.desktop"
--		    JM_HELPDIR="/gnome/help/jm/C"
-+		    JM_HELPDIR="/help/jm/C"
- 		  
- 	      else
- 	        echo "$ac_t""no" 1>&6
-@@ -4962,7 +4962,7 @@
- 		    JM_GLADE_FILE="jm-gnome.glade"
- 		    JM_GNOME_PIXMAP_FILE="jm-logo.png"
- 		    JM_GNOME_DESKTOP_FILE="jm.desktop"
--		    JM_HELPDIR="/gnome/help/jm/C"
-+		    JM_HELPDIR="/help/jm/C"
- 		  
- 	      else
- 	        echo "$ac_t""not found" 1>&6
diff --git a/ftp/junglemonkey/files/patch-doc::C::Makefile.in b/ftp/junglemonkey/files/patch-doc::C::Makefile.in
new file mode 100644
index 000000000000..5c7f90400879
--- /dev/null
+++ b/ftp/junglemonkey/files/patch-doc::C::Makefile.in
@@ -0,0 +1,16 @@
+--- doc/C/Makefile.in.orig	Sat Jun  1 01:45:57 2002
++++ doc/C/Makefile.in	Sat Jun  1 02:08:53 2002
+@@ -314,13 +314,9 @@
+ 
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(jm_helpdir)/images
+-	$(mkinstalldirs) $(DESTDIR)$(jm_helpdir)/stylesheet-images
+ 	-for file in $(srcdir)/jm/*.html $(srcdir)/jm/*.css; do \
+ 		basefile=`basename $$file`; \
+ 		$(INSTALL_DATA) $$file $(DESTDIR)$(jm_helpdir)/$$basefile; \
+-	done
+-	-for file in $(srcdir)/jm/stylesheet-images/*; do \
+-		$(INSTALL_DATA) $$file $(DESTDIR)$(jm_helpdir)/stylesheet-images;\
+ 	done
+ 	-for file in $(srcdir)/images/*.png; do \
+ 		$(INSTALL_DATA) $$file $(DESTDIR)$(jm_helpdir)/images;\
diff --git a/ftp/junglemonkey/pkg-plist b/ftp/junglemonkey/pkg-plist
index 5743036972b5..c465b7c1a8cd 100644
--- a/ftp/junglemonkey/pkg-plist
+++ b/ftp/junglemonkey/pkg-plist
@@ -24,9 +24,9 @@ share/gnome/jm/glade/jm.glade
 share/gnome/jm/glade/master_popup.glade
 share/gnome/jm/glade/preferences_dialog.glade
 share/gnome/jm/glade/properties_dialog.glade
-share/gnome/locale/fr/LC_MESSAGES/jm.mo
-share/gnome/locale/de/LC_MESSAGES/jm.mo
 share/gnome/pixmaps/jm-logo.png
+share/locale/de/LC_MESSAGES/jm.mo
+share/locale/fr/LC_MESSAGES/jm.mo
 @dirrm share/gnome/help/jm/C/images
 @dirrm share/gnome/help/jm/C
 @dirrm share/gnome/help/jm