5 files changed, 86 insertions, 74 deletions

diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index eca010194325..6d460288e3e3 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -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 --git a/x11-fm/dfm/distinfo b/x11-fm/dfm/distinfo
index f4efc3db5c86..6f85718d445f 100644
--- a/x11-fm/dfm/distinfo
+++ b/x11-fm/dfm/distinfo
@@ -1 +1 @@
-MD5 (dfm-0.99.1.tar.gz) = 69107be951265fc35db868cd2272304f
+MD5 (dfm-0.99.6.tar.gz) = 2b8b2bacba0d9a7501d4ab4c401901a5
diff --git a/x11-fm/dfm/files/patch-af b/x11-fm/dfm/files/patch-af
new file mode 100644
index 000000000000..c253d6e205e4
--- /dev/null
+++ b/x11-fm/dfm/files/patch-af
@@ -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 --git a/x11-fm/dfm/pkg-descr b/x11-fm/dfm/pkg-descr
index 2b755dfca4da..b2c1de7eb77d 100644
--- a/x11-fm/dfm/pkg-descr
+++ b/x11-fm/dfm/pkg-descr
@@ -13,5 +13,3 @@ Here are some features:
 * Offix DND support
 * Detail View / Structure View
 * ...
-
-WWW: http://www-c.informatik.uni-hannover.de/~kaiser/dfm/dfm.html
diff --git a/x11-fm/dfm/pkg-plist b/x11-fm/dfm/pkg-plist
index aadc08b55cfa..b64e1b5aa18f 100644
--- a/x11-fm/dfm/pkg-plist
+++ b/x11-fm/dfm/pkg-plist
@@ -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.tgz.xpm
 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/Folders2.xpm
 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/icon_xpm.xpm
 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/doc/dfm/TODO
 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