Attachment 22334 Details for Bug 38782 – file.diff

[patch] file.diff

file.diff (text/plain), 4.05 KB, created by tkato on 2002-05-31 22:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-05-31 22:20:02 UTC

Size: 4.05 KB

patch

obsolete

>diff -urN /usr/ports/ftp/junglemonkey/Makefile ftp/junglemonkey/Makefile
>--- /usr/ports/ftp/junglemonkey/Makefile	Fri May 24 20:24:38 2002
>+++ ftp/junglemonkey/Makefile	Sat Jun  1 02:15:50 2002
>@@ -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 @@
> 
> 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 -urN /usr/ports/ftp/junglemonkey/files/patch-aa ftp/junglemonkey/files/patch-aa
>--- /usr/ports/ftp/junglemonkey/files/patch-aa	Fri May 19 01:08:02 2000
>+++ ftp/junglemonkey/files/patch-aa	Thu Jan  1 09:00:00 1970
>@@ -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 -urN /usr/ports/ftp/junglemonkey/files/patch-doc::C::Makefile.in ftp/junglemonkey/files/patch-doc::C::Makefile.in
>--- /usr/ports/ftp/junglemonkey/files/patch-doc::C::Makefile.in	Thu Jan  1 09:00:00 1970
>+++ ftp/junglemonkey/files/patch-doc::C::Makefile.in	Sat Jun  1 02:09:08 2002
>@@ -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 -urN /usr/ports/ftp/junglemonkey/pkg-plist ftp/junglemonkey/pkg-plist
>--- /usr/ports/ftp/junglemonkey/pkg-plist	Fri May 24 20:24:39 2002
>+++ ftp/junglemonkey/pkg-plist	Sat Jun  1 00:52:39 2002
>@@ -24,9 +24,9 @@
> 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

Actions: View | Diff

Attachments on bug 38782: 22334