diff options
author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:48:57 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:48:57 +0000 |
commit | 1c57323789a922a7182ba378831f2c0a336a6959 (patch) | |
tree | c8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /graphics/gqview | |
parent | ee84541509a09b09b26167f474c4b53185c17b5f (diff) | |
download | pkgsrc-1c57323789a922a7182ba378831f2c0a336a6959.tar.gz |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'graphics/gqview')
-rw-r--r-- | graphics/gqview/Makefile | 12 | ||||
-rw-r--r-- | graphics/gqview/patches/patch-ab | 13 |
2 files changed, 6 insertions, 19 deletions
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index e7b608ac7a7..e8bbcec8de5 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2002/03/13 17:37:09 fredb Exp $ +# $NetBSD: Makefile,v 1.30 2002/08/25 21:49:53 jlam Exp $ # DISTNAME= gqview-1.0.1 @@ -11,8 +11,8 @@ HOMEPAGE= http://gqview.sourceforge.net/ COMMENT= another gtk-based graphic file viewer BUILD_USES_MSGFMT= yes -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=no @@ -20,8 +20,8 @@ CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1 -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/gdk-pixbuf/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/gdk-pixbuf/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gqview/patches/patch-ab b/graphics/gqview/patches/patch-ab deleted file mode 100644 index 2f3131cf7b1..00000000000 --- a/graphics/gqview/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2001/12/29 11:40:29 zuntum Exp $ - ---- src/Makefile.in.orig Sun Dec 16 02:43:25 2001 -+++ src/Makefile.in -@@ -103,7 +103,7 @@ - INCLUDES = -I$(srcdir) -I$(builddir) \ - -I$(top_srcdir) -I$(top_builddir) \ - -DLOCALEDIR=\""$(localedir)"\" \ -- -I$(includedir) $(GTK_CFLAGS) \ -+ $(GTK_CFLAGS) \ - $(GDK_PIXBUF_CFLAGS) - - |