3 files changed, 42 insertions, 23 deletions

diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index e94b2c1ff267..76b503967ada 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -3,17 +3,24 @@
 # Date created:				25 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.9 1998/12/07 20:46:38 billf Exp $
+# $Id: Makefile,v 1.10 1999/01/07 08:19:53 simokawa Exp $
 #
 
-DISTNAME=	dfm-0.9.10
+DISTNAME=	dfm-0.99.1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www-c.informatik.uni-hannover.de/~kaiser/dfm/
 
 MAINTAINER=	andy@icc.surw.chel.su
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		xforms.0:${PORTSDIR}/x11-toolkits/xforms
+		intl.1:${PORTSDIR}/devel/gettext \
+		gmodule12.1:${PORTSDIR}/devel/glib12 \
+		glib12.1:${PORTSDIR}/devel/glib12 \
+		gdk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
+		gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${X11BASE}/include" GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 
 # depends on xforms
 ONLY_FOR_ARCHS=	i386
@@ -24,28 +31,15 @@ WRKSRC=		${WRKDIR}/dfm
 
 MAN1=		dfm.1
 
-do-configure:
-	@ cd ${WRKSRC}; ./config
-
-do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/dfm ${PREFIX}/bin
-	@ ${INSTALL_MAN} ${WRKSRC}/dfm.1x ${PREFIX}/man/man1/dfm.1
-	@ ${MKDIR} ${PREFIX}/share/dfm
-	@ ${MKDIR} ${PREFIX}/share/dfm/backgrounds
-	@ ${INSTALL_DATA} ${WRKSRC}/share/backgrounds/*.xpm ${PREFIX}/share/dfm/backgrounds
-	@ ${MKDIR} ${PREFIX}/share/dfm/icons
-	@ ${INSTALL_DATA} ${WRKSRC}/share/icons/*.xpm ${PREFIX}/share/dfm/icons
-	@ ${MKDIR} ${PREFIX}/share/dfm/icons/Appicons
-	@ ${INSTALL_DATA} ${WRKSRC}/share/icons/Appicons/*.xpm ${PREFIX}/share/dfm/icons/Appicons
-	@ ${MKDIR} ${PREFIX}/share/dfm/icons/Moreicons
-	@ ${INSTALL_DATA} ${WRKSRC}/share/icons/Moreicons/*.xpm ${PREFIX}/share/dfm/icons/Moreicons
+post-install:
+	@ ${MV} ${PREFIX}/man/man1/dfm.1x ${PREFIX}/man/man1/dfm.1
 	@ ${MKDIR} ${PREFIX}/share/examples/dfm
-	@ ${INSTALL_DATA} ${WRKSRC}/extensions/dfmext_local ${PREFIX}/share/examples/dfm/dfmext.sample.local
-	@ ${INSTALL_DATA} ${WRKSRC}/extensions/dfmext_normal ${PREFIX}/share/examples/dfm/dfmext.sample.normal
-	@ ${INSTALL_DATA} ${WRKSRC}/extensions/dfmext_user ${PREFIX}/share/examples/dfm/dfmext.sample.user
+	@ ${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 HELP.ERROR NO_WARRANTY README START TESTED TODO
+.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
 .endfor
 .endif
diff --git a/x11-fm/dfm/distinfo b/x11-fm/dfm/distinfo
index 911da9e4c5a7..f4efc3db5c86 100644
--- a/x11-fm/dfm/distinfo
+++ b/x11-fm/dfm/distinfo
@@ -1 +1 @@
-MD5 (dfm-0.9.10.tar.gz) = 56c89293b2c5e9c6019a30d5a117955c
+MD5 (dfm-0.99.1.tar.gz) = 69107be951265fc35db868cd2272304f
diff --git a/x11-fm/dfm/pkg-plist b/x11-fm/dfm/pkg-plist
index c9f32c46ff3e..aadc08b55cfa 100644
--- a/x11-fm/dfm/pkg-plist
+++ b/x11-fm/dfm/pkg-plist
@@ -1,4 +1,5 @@
 bin/dfm
+share/dfm/dfmext
 share/dfm/backgrounds/background2.xpm
 share/dfm/backgrounds/blues.xpm
 share/dfm/backgrounds/flock.xpm
@@ -10,13 +11,17 @@ 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
@@ -31,6 +36,7 @@ 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
@@ -45,6 +51,22 @@ share/dfm/icons/Appicons/netscape3.xpm
 share/dfm/icons/Appicons/x11amp-icon3.xpm
 share/dfm/icons/Appicons/xcalc.xpm
 share/dfm/icons/Appicons/xv.xpm
+share/dfm/icons/FileManagerIcons/file.bak.xpm
+share/dfm/icons/FileManagerIcons/file.c.xpm
+share/dfm/icons/FileManagerIcons/file.cc.xpm
+share/dfm/icons/FileManagerIcons/file.gimp5.xpm
+share/dfm/icons/FileManagerIcons/file.gz.xpm
+share/dfm/icons/FileManagerIcons/file.html3.xpm
+share/dfm/icons/FileManagerIcons/file.o.xpm
+share/dfm/icons/FileManagerIcons/file.picture.xpm
+share/dfm/icons/FileManagerIcons/file.picture2.xpm
+share/dfm/icons/FileManagerIcons/file.ps.xpm
+share/dfm/icons/FileManagerIcons/file.tar.xpm
+share/dfm/icons/FileManagerIcons/file.text.xpm
+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
@@ -86,6 +108,8 @@ share/doc/dfm/BUGS
 share/doc/dfm/COPYING
 share/doc/dfm/COPYRIGHT
 share/doc/dfm/CREDITS
+share/doc/dfm/ChangeLog
+share/doc/dfm/DOWNLOAD
 share/doc/dfm/HELP.ERROR
 share/doc/dfm/NO_WARRANTY
 share/doc/dfm/README
@@ -97,6 +121,7 @@ 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
 @dirrm share/dfm/icons/Moreicons
 @dirrm share/dfm/icons
 @dirrm share/dfm