4 files changed, 23 insertions, 29 deletions

diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index 16efb8a21dab..2f7f7172dce8 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	dfm
-PORTVERSION=	0.99.7
+PORTVERSION=	0.99.8
 CATEGORIES=	x11-fm
-MASTER_SITES=   http://dfm.online.de/
+MASTER_SITES=	http://dfm.online.de/
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -20,12 +20,17 @@ USE_IMLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-imlib-icons
 
 MAN1=		dfm.1x
 
-DFM_DOCS=	ANNOUNCE BUGS COPYRIGHT CREDITS ChangeLog DOWNLOAD HELP.ERROR \
+PORTDOCS=	ANNOUNCE BUGS COPYRIGHT CREDITS ChangeLog DOWNLOAD HELP.ERROR \
 		NO_WARRANTY README START TESTED TODO
 
+pre-patch:
+	@${PERL} -pi -e \
+		's|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/dfm
 	${INSTALL_DATA} ${WRKSRC}/dfmext-samples/dfmext_local ${PREFIX}/share/examples/dfm/dfmext.sample.local
@@ -33,7 +38,7 @@ post-install:
 	${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 ${DFM_DOCS}
+.for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/dfm
 .endfor
 .endif
diff --git a/x11-fm/dfm/distinfo b/x11-fm/dfm/distinfo
index 361d03caf3b3..5deac12dd58f 100644
--- a/x11-fm/dfm/distinfo
+++ b/x11-fm/dfm/distinfo
@@ -1 +1 @@
-MD5 (dfm-0.99.7.tar.gz) = 6717a24ec363d34d9a48607ff54763da
+MD5 (dfm-0.99.8.tar.gz) = ad61f0863da3051a508461423cbc67ad
diff --git a/x11-fm/dfm/files/patch-af b/x11-fm/dfm/files/patch-af
deleted file mode 100644
index c253d6e205e4..000000000000
--- a/x11-fm/dfm/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-plist b/x11-fm/dfm/pkg-plist
index b64e1b5aa18f..fd532b93b713 100644
--- a/x11-fm/dfm/pkg-plist
+++ b/x11-fm/dfm/pkg-plist
@@ -104,25 +104,25 @@ 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/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
-share/doc/dfm/START
-share/doc/dfm/TESTED
-share/doc/dfm/TODO
+%%PORTDOCS%%share/doc/dfm/ANNOUNCE
+%%PORTDOCS%%share/doc/dfm/BUGS
+%%PORTDOCS%%share/doc/dfm/COPYRIGHT
+%%PORTDOCS%%share/doc/dfm/CREDITS
+%%PORTDOCS%%share/doc/dfm/ChangeLog
+%%PORTDOCS%%share/doc/dfm/DOWNLOAD
+%%PORTDOCS%%share/doc/dfm/HELP.ERROR
+%%PORTDOCS%%share/doc/dfm/NO_WARRANTY
+%%PORTDOCS%%share/doc/dfm/README
+%%PORTDOCS%%share/doc/dfm/START
+%%PORTDOCS%%share/doc/dfm/TESTED
+%%PORTDOCS%%share/doc/dfm/TODO
 share/examples/dfm/dfmext.sample.local
 share/examples/dfm/dfmext.sample.normal
 share/examples/dfm/dfmext.sample.user
 share/locale/da/LC_MESSAGES/dfm.mo
 share/locale/de/LC_MESSAGES/dfm.mo
 @dirrm share/examples/dfm
-@dirrm share/doc/dfm
+%%PORTDOCS%%@dirrm share/doc/dfm
 @dirrm share/dfm/icons/Moreicons
 @dirrm share/dfm/icons/FileManagerIcons
 @dirrm share/dfm/icons/Appicons