diff options
| author | snj <snj@pkgsrc.org> | 2004-04-26 22:07:06 +0000 |
|---|---|---|
| committer | snj <snj@pkgsrc.org> | 2004-04-26 22:07:06 +0000 |
| commit | 820e439a9a3dca428857b86f83a228814fc24328 (patch) | |
| tree | 04312bca1575c04c046dd1018226e2c4dd1383be /x11/gtk-- | |
| parent | 263d305dcdba2a10a1bb60947a15c366de04b3d6 (diff) | |
| download | pkgsrc-820e439a9a3dca428857b86f83a228814fc24328.tar.gz | |
Convert to buildlink3.
Diffstat (limited to 'x11/gtk--')
| -rw-r--r-- | x11/gtk--/Makefile | 8 | ||||
| -rw-r--r-- | x11/gtk--/buildlink3.mk | 21 | ||||
| -rw-r--r-- | x11/gtk--/distinfo | 3 | ||||
| -rw-r--r-- | x11/gtk--/patches/patch-ab | 13 |
4 files changed, 40 insertions, 5 deletions
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile index b71c61ea4b7..c4e00ddf457 100644 --- a/x11/gtk--/Makefile +++ b/x11/gtk--/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/02/14 17:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2004/04/26 22:07:06 snj Exp $ # DISTNAME= gtkmm-1.2.10 @@ -14,7 +14,7 @@ COMMENT= C++ wrapper for GTK+ USE_X11BASE= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_PERL5= build USE_GNU_TOOLS+= m4 make @@ -28,6 +28,6 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/gtk--.m4 \ ${LOCALBASE}/share/aclocal/gtk--.m4 -.include "../../devel/libsigc++10/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" +.include "../../devel/libsigc++10/buildlink3.mk" +.include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk--/buildlink3.mk b/x11/gtk--/buildlink3.mk new file mode 100644 index 00000000000..50e6c5c480a --- /dev/null +++ b/x11/gtk--/buildlink3.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 22:07:06 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GTKMM_BUILDLINK3_MK:= ${GTKMM_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gtkmm +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkmm} +BUILDLINK_PACKAGES+= gtkmm + +.if !empty(GTKMM_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.gtkmm+= gtk-->=1.2.10nb3 +BUILDLINK_PKGSRCDIR.gtkmm?= ../../x11/gtk-- +.endif # GTKMM_BUILDLINK3_MK + +.include "../../devel/libsigc++10/buildlink3.mk" +.include "../../x11/gtk/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gtk--/distinfo b/x11/gtk--/distinfo index 388b3586c12..dfc944a48f7 100644 --- a/x11/gtk--/distinfo +++ b/x11/gtk--/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.6 2002/10/27 13:34:59 bouyer Exp $ +$NetBSD: distinfo,v 1.7 2004/04/26 22:07:06 snj Exp $ SHA1 (gtkmm-1.2.10.tar.gz) = fb220aa8bdb609b7ead42fac1afbbbf57031fb2a Size (gtkmm-1.2.10.tar.gz) = 716700 bytes SHA1 (patch-aa) = f23a20f6fa3912d9d1a743363de0fcaf8c69818d +SHA1 (patch-ab) = 42c8a11cf88e105290dac40d9d2de75c02afb93c SHA1 (patch-ag) = de2719b25d41927b52f2de7bf5ee1a4720c34e26 SHA1 (patch-ah) = 5bd15cf450b81c6bc6f73e9f5f0ccd1700e5c626 SHA1 (patch-ai) = d9c3a26edf0dd0baca519b5477f09ba267fbebd5 diff --git a/x11/gtk--/patches/patch-ab b/x11/gtk--/patches/patch-ab new file mode 100644 index 00000000000..95945f42546 --- /dev/null +++ b/x11/gtk--/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.3 2004/04/26 22:07:06 snj Exp $ + +--- src/gtkmmproc/Makefile.in.orig 2004-04-26 14:30:13.000000000 -0700 ++++ src/gtkmmproc/Makefile.in 2004-04-26 14:30:30.000000000 -0700 +@@ -113,7 +113,7 @@ m4include_HEADERS = doc1.m4 stage1.m4 co + + YFLAGS = -d + CXXFLAGS = +-CPPFLAGS = -D MACRO_DIR=\"$(m4includedir)\" -D M4=\"@M4@\" ++CPPFLAGS = -DMACRO_DIR=\"$(m4includedir)\" -DM4=\"@M4@\" + mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs + CONFIG_HEADER = ../../config.h ../../gdk--config.h ../../gtk--config.h + CONFIG_CLEAN_FILES = |