>Number:         14098
>Category:       pkg
>Synopsis:       fix for x11/dfm
>Confidential:   yes
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 29 09:19:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Hiramatsu Yoshifumi
>Release:        NetBSD-current 2001-08-28
>Organization:
	
>Environment:
System: NetBSD except.my.domain 1.5X NetBSD 1.5X (GENERIC) #0: Tue Aug 28 06:33:30 PDT 2001 chs@pc:/usr/chs/netbsd/obj/usr/chs/netbsd/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
x11/dfm
(1) cannot be built on xpkgwedge environment
(2) it installs man/man1/dfm.1x although PLIST points man/man1/dfm.1

>How-To-Repeat:
cd pkgtools/xpkgwedge && make install
cd x11/dfm && make package

>Fix:
In addition to build fixes, this patch converts
`USE_X11' to `.include "../../mk/x11.buildlink.mk"' according to
section 8.3 in Packages.txt.

diff -bru dfm.orig/Makefile dfm/Makefile
--- dfm.orig/Makefile	Sun Sep 30 00:10:47 2001
+++ dfm/Makefile	Sun Sep 30 00:48:04 2001
@@ -6,4 +6,7 @@
 MAINTAINER=	hubertf@netbsd.org
 COMMENT=	Desktop File Manager
 
+post-install:
+	${MV} ${PREFIX}/man/man1/dfm.1x ${PREFIX}/man/man1/dfm.1
+
 .include "Makefile.common"
diff -bru dfm.orig/Makefile.common dfm/Makefile.common
--- dfm.orig/Makefile.common	Sun Sep 30 00:10:47 2001
+++ dfm/Makefile.common	Sun Sep 30 00:48:04 2001
@@ -4,13 +4,11 @@
 DISTNAME=	dfm-0.99.9
 MASTER_SITES=	http://www.kaisersite.de/dfm/
 
-USE_X11=	yes
 WRKSRC=		${WRKDIR}/dfm
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-imlib-prefix=${X11PREFIX} \
-		--enable-imlib-icons \
-		--with-gtk-prefix=${X11BASE}
+CONFIGURE_ARGS+=	--enable-imlib-icons
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"

>Release-Note:
>Audit-Trail:
>Unformatted: