diff options
| author | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
| commit | b6b94f0c669b1ef2a824c69854900b68ec821681 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /x11/dfm | |
| parent | ac9820da6cdeb5833fdaf2717a1633972572c5de (diff) | |
| download | pkgsrc-b6b94f0c669b1ef2a824c69854900b68ec821681.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'x11/dfm')
| -rw-r--r-- | x11/dfm/Makefile.common | 15 | ||||
| -rw-r--r-- | x11/dfm/distinfo | 3 | ||||
| -rw-r--r-- | x11/dfm/patches/patch-aa | 15 |
3 files changed, 9 insertions, 24 deletions
diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common index 9621643c0a8..38ceb908585 100644 --- a/x11/dfm/Makefile.common +++ b/x11/dfm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2002/03/13 17:37:54 fredb Exp $ +# $NetBSD: Makefile.common,v 1.4 2002/08/25 21:52:32 jlam Exp $ # DISTNAME= dfm-0.99.9 @@ -6,13 +6,14 @@ PKGREVISION= 1 MASTER_SITES= http://www.kaisersite.de/dfm/ WRKSRC= ${WRKDIR}/dfm +USE_BUILDLINK2= yes +USE_X11= yes GNU_CONFIGURE= yes 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 "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/dfm/distinfo b/x11/dfm/distinfo index 23e18247703..8a501fecbad 100644 --- a/x11/dfm/distinfo +++ b/x11/dfm/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/10/21 10:50:00 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/08/25 21:52:32 jlam 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 deleted file mode 100644 index 32c955f9754..00000000000 --- a/x11/dfm/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$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. |