diff options
| author | rh <rh> | 2002-10-30 03:09:25 +0000 |
|---|---|---|
| committer | rh <rh> | 2002-10-30 03:09:25 +0000 |
| commit | 4420c0738fb454cd1c2373e2252c894ff1e0da1d (patch) | |
| tree | b57a6c9b34c1159eea1751ac22709c1f6436e822 /x11/gtk | |
| parent | 59c8ab91dfdd31d963a8b0328b20b6c185db65e4 (diff) | |
| download | pkgsrc-4420c0738fb454cd1c2373e2252c894ff1e0da1d.tar.gz | |
Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE.
Diffstat (limited to 'x11/gtk')
| -rw-r--r-- | x11/gtk/Makefile | 8 | ||||
| -rw-r--r-- | x11/gtk/distinfo | 4 | ||||
| -rw-r--r-- | x11/gtk/patches/patch-ag | 11 | ||||
| -rw-r--r-- | x11/gtk/patches/patch-ah | 11 |
4 files changed, 6 insertions, 28 deletions
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 5fc3b5a1090..5f0d64d75f4 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2002/10/19 10:55:02 rh Exp $ +# $NetBSD: Makefile,v 1.77 2002/10/30 03:09:39 rh Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 3 @@ -16,10 +16,12 @@ BUILD_USES_MSGFMT= yes USE_BUILDLINK2= yes USE_PERL5= build -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_X11BASE= yes USE_GMAKE= yes +USE_LIBTOOL= yes +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +PKGCONFIG_OVERRIDE= ${WRKSRC}/gdk.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtk+.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-xinput=xfree \ diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo index 0614c26fe82..d788d1bf0f7 100644 --- a/x11/gtk/distinfo +++ b/x11/gtk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/09/01 14:52:29 tron Exp $ +$NetBSD: distinfo,v 1.6 2002/10/30 03:09:39 rh Exp $ SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c Size (gtk+-1.2.10.tar.gz) = 2868322 bytes @@ -8,5 +8,3 @@ SHA1 (patch-ac) = 4f7ffd7dbca81740e8b0304f96f7b3ce592404db SHA1 (patch-ad) = 86c29afeaf008e0412298047da6e7cb545c8fc60 SHA1 (patch-ae) = 8ad654085ee8688d083e00b5f968dd732285ff9c SHA1 (patch-af) = d969891b6d8fa493294971894b5a355023c75460 -SHA1 (patch-ag) = c5ad908a4ecb18ee0f986d0d18b0248bcbac4b90 -SHA1 (patch-ah) = 4bf43bd6c5481048c6babb9c56a1b99326963cf3 diff --git a/x11/gtk/patches/patch-ag b/x11/gtk/patches/patch-ag deleted file mode 100644 index 3cf44e21680..00000000000 --- a/x11/gtk/patches/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ -$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 -@@ -7,5 +7,5 @@ Name: GDK - Description: GIMP Drawing Kit - Version: @VERSION@ - Requires: glib --Libs: -L${libdir} @x_ldflags@ -lgdk @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm -+Libs: -L${libdir} -Wl,-R${libdir} @x_ldflags@ -lgdk @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm - Cflags: -I${includedir}/gtk-1.2 @x_cflags@ diff --git a/x11/gtk/patches/patch-ah b/x11/gtk/patches/patch-ah deleted file mode 100644 index 083a051d8d5..00000000000 --- a/x11/gtk/patches/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ -$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 -@@ -7,5 +7,5 @@ Name: GTK+ - Description: GIMP Tool Kit - Version: @VERSION@ - Requires: gdk --Libs: -L${libdir} -lgtk -+Libs: -L${libdir} -Wl,-R${libdir} -lgtk - Cflags: |