Attachment 9703 Details for Bug 19766 – file.diff

[patch] file.diff

file.diff (text/plain), 9.00 KB, created by tkato on 2000-07-07 22:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-07-07 22:40:01 UTC

Size: 9.00 KB

patch

obsolete

>diff -urN /usr/ports/x11-fm/dfm/Makefile x11-fm/dfm/Makefile
>--- /usr/ports/x11-fm/dfm/Makefile	Mon Apr 10 21:06:36 2000
>+++ x11-fm/dfm/Makefile	Sat Jul  8 06:25:21 2000
>@@ -6,38 +6,39 @@
> #
> 
> PORTNAME=	dfm
>-PORTVERSION= 	0.99.1
>+PORTVERSION= 	0.99.6
> CATEGORIES=	x11-fm
>-MASTER_SITES=	http://www-c.informatik.uni-hannover.de/~kaiser/dfm/
>+MASTER_SITES=	http://linux.tucows.com/files/x11/file/
> 
> MAINTAINER=	ports@FreeBSD.org
> 
> LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
>-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
>+		gdk_imlib.5:${PORTSDIR}/graphics/imlib
> 
> GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
> 
>+WRKSRC=		${WRKDIR}/${PORTNAME}
>+USE_X_PREFIX=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		GTK_CONFIG="${GTK_CONFIG}" \
> 		LIBS="-L${LOCALBASE}/lib"		
>+CONFIGURE_ARGS=	--disable-gtktest --disable-imlibtest
> 
>-USE_X_PREFIX=	yes
>-
>-WRKSRC=		${WRKDIR}/dfm
>+MAN1=		dfm.1x
> 
>-MAN1=		dfm.1
>+DFM_DOCS=	ANNOUNCE BUGS COPYRIGHT CREDITS ChangeLog DOWNLOAD HELP.ERROR \
>+		NO_WARRANTY README START TESTED TODO
> 
> post-install:
>-	@ ${MV} ${PREFIX}/man/man1/dfm.1x ${PREFIX}/man/man1/dfm.1
>-	@ ${MKDIR} ${PREFIX}/share/examples/dfm
>-	@ ${INSTALL_DATA} ${WRKSRC}/dfmext-samples/dfmext_local ${PREFIX}/share/examples/dfm/dfmext.sample.local
>-	@ ${INSTALL_DATA} ${WRKSRC}/dfmext-samples/dfmext_normal ${PREFIX}/share/examples/dfm/dfmext.sample.normal
>-	@ ${INSTALL_DATA} ${WRKSRC}/dfmext-samples/dfmext_user ${PREFIX}/share/examples/dfm/dfmext.sample.user
>+	@${MKDIR} ${PREFIX}/share/examples/dfm
>+	${INSTALL_DATA} ${WRKSRC}/dfmext-samples/dfmext_local ${PREFIX}/share/examples/dfm/dfmext.sample.local
>+	${INSTALL_DATA} ${WRKSRC}/dfmext-samples/dfmext_normal ${PREFIX}/share/examples/dfm/dfmext.sample.normal
>+	${INSTALL_DATA} ${WRKSRC}/dfmext-samples/dfmext_user ${PREFIX}/share/examples/dfm/dfmext.sample.user
> .if !defined(NOPORTDOCS)
>-	@ ${MKDIR} ${PREFIX}/share/doc/dfm
>-.for file in ANNOUNCE BUGS COPYING COPYRIGHT CREDITS ChangeLog DOWNLOAD HELP.ERROR NO_WARRANTY README START TESTED TODO
>-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/dfm
>+	@${MKDIR} ${PREFIX}/share/doc/dfm
>+.for file in ${DFM_DOCS}
>+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/dfm
> .endfor
> .endif
> 
>diff -urN /usr/ports/x11-fm/dfm/files/md5 x11-fm/dfm/files/md5
>--- /usr/ports/x11-fm/dfm/files/md5	Sat May  1 12:00:52 1999
>+++ x11-fm/dfm/files/md5	Sat Jun 17 14:44:02 2000
>@@ -1 +1 @@
>-MD5 (dfm-0.99.1.tar.gz) = 69107be951265fc35db868cd2272304f
>+MD5 (dfm-0.99.6.tar.gz) = 2b8b2bacba0d9a7501d4ab4c401901a5
>diff -urN /usr/ports/x11-fm/dfm/patches/patch-af x11-fm/dfm/patches/patch-af
>--- /usr/ports/x11-fm/dfm/patches/patch-af	Thu Jan  1 09:00:00 1970
>+++ x11-fm/dfm/patches/patch-af	Tue Jun 20 01:06:05 2000
>@@ -0,0 +1,11 @@
>+--- configure.orig	Mon Nov 29 02:51:35 1999
>++++ configure	Tue Jun 20 01:05:56 2000
>+@@ -3468,7 +3468,7 @@
>+   cat conftest.$ac_ext >&5
>+   rm -rf conftest*
>+   CATOBJEXT=.mo
>+-		   DATADIRNAME=lib
>++		   DATADIRNAME=share
>+ fi
>+ rm -f conftest*
>+ 		INSTOBJEXT=.mo
>diff -urN /usr/ports/x11-fm/dfm/pkg/DESCR x11-fm/dfm/pkg/DESCR
>--- /usr/ports/x11-fm/dfm/pkg/DESCR	Mon May  3 13:45:56 1999
>+++ x11-fm/dfm/pkg/DESCR	Sat Jun 17 14:50:28 2000
>@@ -13,5 +13,3 @@
> * Offix DND support
> * Detail View / Structure View
> * ...
>-
>-WWW: http://www-c.informatik.uni-hannover.de/~kaiser/dfm/dfm.html
>diff -urN /usr/ports/x11-fm/dfm/pkg/PLIST x11-fm/dfm/pkg/PLIST
>--- /usr/ports/x11-fm/dfm/pkg/PLIST	Sat May  1 12:00:57 1999
>+++ x11-fm/dfm/pkg/PLIST	Sat Jul  8 06:26:37 2000
>@@ -1,55 +1,14 @@
> bin/dfm
>-share/dfm/dfmext
> share/dfm/backgrounds/background2.xpm
> share/dfm/backgrounds/blues.xpm
> share/dfm/backgrounds/flock.xpm
> share/dfm/backgrounds/t1.xpm
>-share/dfm/icons/icon_a.xpm
>-share/dfm/icons/icon_archive.xpm
>-share/dfm/icons/icon_audio.xpm
>-share/dfm/icons/icon_audio_midi.xpm
>-share/dfm/icons/icon_binary.xpm
>-share/dfm/icons/icon_binary_ms.xpm
>-share/dfm/icons/icon_bitmap.xpm
>-share/dfm/icons/icon_blitz.xpm
>-share/dfm/icons/icon_c.xpm
>-share/dfm/icons/icon_cc.xpm
>-share/dfm/icons/icon_core.xpm
>-share/dfm/icons/icon_document.xpm
>-share/dfm/icons/icon_document_tex.xpm
>-share/dfm/icons/icon_document_lout.xpm
>-share/dfm/icons/icon_document_lyx.xpm
>-share/dfm/icons/icon_document_print.xpm
>-share/dfm/icons/icon_document_spreadsheet.xpm
>-share/dfm/icons/icon_document_spreadsheet2.xpm
>-share/dfm/icons/icon_editor.xpm
>-share/dfm/icons/icon_file.xpm
>-share/dfm/icons/icon_fig.xpm
>-share/dfm/icons/icon_folder.xpm
>-share/dfm/icons/icon_folder_binary.xpm
>-share/dfm/icons/icon_folder_trashcan.xpm
>-share/dfm/icons/icon_gzip.xpm
>-share/dfm/icons/icon_h.xpm
>-share/dfm/icons/icon_html.xpm
>-share/dfm/icons/icon_info.xpm
>-share/dfm/icons/icon_makefile.xpm
>-share/dfm/icons/icon_o.xpm
>-share/dfm/icons/icon_pdf.xpm
>-share/dfm/icons/icon_phone.xpm
>-share/dfm/icons/icon_php3.xpm
>-share/dfm/icons/icon_picture.xpm
>-share/dfm/icons/icon_printer.xpm
>-share/dfm/icons/icon_ps.xpm
>-share/dfm/icons/icon_settings.xpm
>-share/dfm/icons/icon_text.xpm
>-share/dfm/icons/icon_video.xpm
>-share/dfm/icons/icon_xterm.xpm
>+share/dfm/dfmext
> share/dfm/icons/Appicons/NetscapeLogo.xpm
>-share/dfm/icons/Appicons/SunMicrosystemsMonitor.xpm
> share/dfm/icons/Appicons/gimp.xpm
> share/dfm/icons/Appicons/netscape3.xpm
> share/dfm/icons/Appicons/x11amp-icon3.xpm
>-share/dfm/icons/Appicons/xcalc.xpm
>+share/dfm/icons/Appicons/xterm.xpm
> share/dfm/icons/Appicons/xv.xpm
> share/dfm/icons/FileManagerIcons/file.bak.xpm
> share/dfm/icons/FileManagerIcons/file.c.xpm
>@@ -67,7 +26,6 @@
> share/dfm/icons/FileManagerIcons/file.xpm
> share/dfm/icons/FileManagerIcons/folder.xpm
> share/dfm/icons/FileManagerIcons/trash.empty.xpm
>-share/dfm/icons/Moreicons/ColoredCompactDisc.xpm
> share/dfm/icons/Moreicons/DiskFloppy.xpm
> share/dfm/icons/Moreicons/FilingCabinet.xpm
> share/dfm/icons/Moreicons/FilmNegative.xpm
>@@ -78,18 +36,19 @@
> share/dfm/icons/Moreicons/HP-16C-48.xpm
> share/dfm/icons/Moreicons/Magnify.xpm
> share/dfm/icons/Moreicons/NeXTterm5.xpm
>+share/dfm/icons/Moreicons/PhoneTT.xpm
> share/dfm/icons/Moreicons/PhoneTTOffhook.xpm
>-share/dfm/icons/Moreicons/trashcan.xpm
>-share/dfm/icons/Moreicons/TerminalSmiley.xpm
>-share/dfm/icons/Moreicons/texicon.xpm
>-share/dfm/icons/Moreicons/foldericon.xpm
>+share/dfm/icons/Moreicons/SunMicrosystemsMonitor.xpm
> share/dfm/icons/Moreicons/Tablet.xpm
>-share/dfm/icons/Moreicons/PhoneTT.xpm
>+share/dfm/icons/Moreicons/TerminalSmiley.xpm
> share/dfm/icons/Moreicons/WindowsLogoMonitor.xpm
> share/dfm/icons/Moreicons/audio.xpm
>+share/dfm/icons/Moreicons/calculator.xpm
>+share/dfm/icons/Moreicons/disk-cd.xpm
> share/dfm/icons/Moreicons/disk.xpm
> share/dfm/icons/Moreicons/dosprgicon.xpm
> share/dfm/icons/Moreicons/editor.xpm
>+share/dfm/icons/Moreicons/foldericon.xpm
> share/dfm/icons/Moreicons/home.xpm
> share/dfm/icons/Moreicons/icon_bmp.xpm
> share/dfm/icons/Moreicons/icon_gif.xpm
>@@ -102,10 +61,51 @@
> share/dfm/icons/Moreicons/prgicon.xpm
> share/dfm/icons/Moreicons/printer.xpm
> share/dfm/icons/Moreicons/psicon.xpm
>+share/dfm/icons/Moreicons/texicon.xpm
>+share/dfm/icons/Moreicons/trashcan.xpm
> share/dfm/icons/Moreicons/xpmicon.xpm
>+share/dfm/icons/icon_a.xpm
>+share/dfm/icons/icon_archive.xpm
>+share/dfm/icons/icon_audio.xpm
>+share/dfm/icons/icon_audio_midi.xpm
>+share/dfm/icons/icon_binary.xpm
>+share/dfm/icons/icon_binary_ms.xpm
>+share/dfm/icons/icon_bitmap.xpm
>+share/dfm/icons/icon_blitz.xpm
>+share/dfm/icons/icon_c.xpm
>+share/dfm/icons/icon_cc.xpm
>+share/dfm/icons/icon_core.xpm
>+share/dfm/icons/icon_document.xpm
>+share/dfm/icons/icon_document_lout.xpm
>+share/dfm/icons/icon_document_lyx.xpm
>+share/dfm/icons/icon_document_print.xpm
>+share/dfm/icons/icon_document_spreadsheet.xpm
>+share/dfm/icons/icon_document_spreadsheet2.xpm
>+share/dfm/icons/icon_document_tex.xpm
>+share/dfm/icons/icon_editor.xpm
>+share/dfm/icons/icon_fig.xpm
>+share/dfm/icons/icon_file.xpm
>+share/dfm/icons/icon_folder.xpm
>+share/dfm/icons/icon_folder_binary.xpm
>+share/dfm/icons/icon_folder_trashcan.xpm
>+share/dfm/icons/icon_gzip.xpm
>+share/dfm/icons/icon_h.xpm
>+share/dfm/icons/icon_html.xpm
>+share/dfm/icons/icon_info.xpm
>+share/dfm/icons/icon_makefile.xpm
>+share/dfm/icons/icon_o.xpm
>+share/dfm/icons/icon_pdf.xpm
>+share/dfm/icons/icon_phone.xpm
>+share/dfm/icons/icon_php3.xpm
>+share/dfm/icons/icon_picture.xpm
>+share/dfm/icons/icon_printer.xpm
>+share/dfm/icons/icon_ps.xpm
>+share/dfm/icons/icon_settings.xpm
>+share/dfm/icons/icon_text.xpm
>+share/dfm/icons/icon_video.xpm
>+share/dfm/icons/icon_xterm.xpm
> share/doc/dfm/ANNOUNCE
> share/doc/dfm/BUGS
>-share/doc/dfm/COPYING
> share/doc/dfm/COPYRIGHT
> share/doc/dfm/CREDITS
> share/doc/dfm/ChangeLog
>@@ -119,11 +119,13 @@
> share/examples/dfm/dfmext.sample.local
> share/examples/dfm/dfmext.sample.normal
> share/examples/dfm/dfmext.sample.user
>-@dirrm share/dfm/backgrounds
>-@dirrm share/dfm/icons/Appicons
>-@dirrm share/dfm/icons/FileManagerIcons
>+share/locale/da/LC_MESSAGES/dfm.mo
>+share/locale/de/LC_MESSAGES/dfm.mo
>+@dirrm share/examples/dfm
>+@dirrm share/doc/dfm
> @dirrm share/dfm/icons/Moreicons
>+@dirrm share/dfm/icons/FileManagerIcons
>+@dirrm share/dfm/icons/Appicons
> @dirrm share/dfm/icons
>+@dirrm share/dfm/backgrounds
> @dirrm share/dfm
>-@dirrm share/doc/dfm
>-@dirrm share/examples/dfm

Actions: View | Diff

Attachments on bug 19766: 9703