From 673a539b6bc45581573864cc53b46df120642738 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sun, 21 Oct 2001 10:49:59 +0000
Subject: xpkgwedge fixes by Hiramatsu Yoshifumi in pkg/14098, and complete
 buildlinkification.

---
 x11/dfm/Makefile         |  5 ++++-
 x11/dfm/Makefile.common  | 10 ++++------
 x11/dfm/distinfo         |  3 ++-
 x11/dfm/patches/patch-aa | 15 +++++++++++++++
 4 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 x11/dfm/patches/patch-aa

(limited to 'x11/dfm')

diff --git a/x11/dfm/Makefile b/x11/dfm/Makefile
index c5bc0e6fa14..b8f714e1fdb 100644
--- a/x11/dfm/Makefile
+++ b/x11/dfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/05 01:49:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/21 10:49:59 wiz Exp $
 #
 
 CATEGORIES=	x11
@@ -6,4 +6,7 @@ CATEGORIES=	x11
 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 --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common
index 4ab25878d98..a45f6f7ab55 100644
--- a/x11/dfm/Makefile.common
+++ b/x11/dfm/Makefile.common
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile.common,v 1.1 2001/08/05 01:49:58 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.2 2001/10/21 10:49:59 wiz Exp $
 #
 
 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
+USE_BUILDLINK_ONLY= yes
 
 .include "../../x11/gtk/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
-
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/dfm/distinfo b/x11/dfm/distinfo
index c09b5ac9c18..23e18247703 100644
--- a/x11/dfm/distinfo
+++ b/x11/dfm/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/05 00:23:14 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2001/10/21 10:50:00 wiz Exp $
 
 SHA1 (dfm-0.99.9.tar.gz) = 491f7ed1f8f82a0272143fa79b1b7ca705d34664
 Size (dfm-0.99.9.tar.gz) = 389444 bytes
+SHA1 (patch-aa) = e30096229341008235a70d84620b877dac8d461e
diff --git a/x11/dfm/patches/patch-aa b/x11/dfm/patches/patch-aa
new file mode 100644
index 00000000000..32c955f9754
--- /dev/null
+++ b/x11/dfm/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2001/10/21 10:50:00 wiz Exp $
+
+--- configure.orig	Tue May  1 22:58:11 2001
++++ configure
+@@ -2064,8 +2064,8 @@
+ fi
+ 
+ 
+-CPPFLAGS="$CPPFLAGS $X_CFLAGS -I/usr/local/include"
+-LIBS="$LIBS $X_LIBS -L/usr/local/lib"
++CPPFLAGS="$CPPFLAGS $X_CFLAGS"
++LIBS="$LIBS $X_LIBS"
+ 
+ ALL_LINGUAS="de da ru"
+ # Extract the first word of "ranlib", so it can be a program name with args.
-- 
cgit v1.2.3