diff options
Diffstat (limited to 'x11/gtk')
| -rw-r--r-- | x11/gtk/Makefile | 11 | ||||
| -rw-r--r-- | x11/gtk/PLIST | 2 | ||||
| -rw-r--r-- | x11/gtk/buildlink2.mk | 25 | ||||
| -rw-r--r-- | x11/gtk/distinfo | 2 | ||||
| -rw-r--r-- | x11/gtk/patches/patch-ag | 2 | ||||
| -rw-r--r-- | x11/gtk/patches/patch-ah | 2 |
6 files changed, 34 insertions, 10 deletions
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 3b1e833f836..da0b6a161f6 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2002/08/13 14:53:31 tron Exp $ +# $NetBSD: Makefile,v 1.75 2002/08/25 18:40:33 jlam Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 3 @@ -14,7 +14,7 @@ COMMENT= Gimp toolkit. Libraries for building X11 user interfaces BUILD_USES_MSGFMT= yes -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_PERL5= build USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig @@ -35,7 +35,7 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} # The following ensures that `gtk-config --libs' includes the correct linker # flags for linking the X11 libs. # -X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib +X_LDFLAGS= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib GTK_VERSION= ${DISTNAME:S/gtk+-//} GTK_MAJOR_VERSION= ${GTK_VERSION:C/\..*//} @@ -65,8 +65,7 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \ ${LOCALBASE}/share/aclocal/gtk.m4 -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/glib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/PLIST b/x11/gtk/PLIST index cfb90b9903e..e99bb0b7090 100644 --- a/x11/gtk/PLIST +++ b/x11/gtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/08/01 09:32:16 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/08/25 18:40:33 jlam Exp $ bin/gtk-config share/gtk/gtkrc.az share/gtk/gtkrc.be diff --git a/x11/gtk/buildlink2.mk b/x11/gtk/buildlink2.mk new file mode 100644 index 00000000000..78b57d90d49 --- /dev/null +++ b/x11/gtk/buildlink2.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:33 jlam Exp $ + +.if !defined(GTK_BUILDLINK2_MK) +GTK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= gtk +BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.8 +BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk + +EVAL_PREFIX+= BUILDLINK_PREFIX.gtk=gtk +BUILDLINK_PREFIX.gtk_DEFAULT= ${X11PREFIX} +BUILDLINK_FILES.gtk= include/gdk/* +BUILDLINK_FILES.gtk+= include/gtk/* +BUILDLINK_FILES.gtk+= include/gtk-*/*/* +BUILDLINK_FILES.gtk+= lib/libgdk.* +BUILDLINK_FILES.gtk+= lib/libgtk.* + +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib/buildlink2.mk" + +BUILDLINK_TARGETS+= gtk-buildlink + +gtk-buildlink: _BUILDLINK_USE + +.endif # GTK_BUILDLINK2_MK diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo index fdd41e3ad09..660a4a5112c 100644 --- a/x11/gtk/distinfo +++ b/x11/gtk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/07/18 02:19:33 rh Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 18:40:34 jlam Exp $ SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c Size (gtk+-1.2.10.tar.gz) = 2868322 bytes diff --git a/x11/gtk/patches/patch-ag b/x11/gtk/patches/patch-ag index 8c3c29016f5..3cf44e21680 100644 --- a/x11/gtk/patches/patch-ag +++ b/x11/gtk/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2002/07/18 02:19:34 rh Exp $ +$NetBSD: patch-ag,v 1.2 2002/08/25 18:40:34 jlam Exp $ --- gdk.pc.in.orig Thu Nov 30 11:18:35 2000 +++ gdk.pc.in diff --git a/x11/gtk/patches/patch-ah b/x11/gtk/patches/patch-ah index 3f01b379916..083a051d8d5 100644 --- a/x11/gtk/patches/patch-ah +++ b/x11/gtk/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 2002/07/18 02:19:35 rh Exp $ +$NetBSD: patch-ah,v 1.2 2002/08/25 18:40:35 jlam Exp $ --- gtk+.pc.in.orig Thu Nov 30 11:18:35 2000 +++ gtk+.pc.in |