diff options
| -rw-r--r-- | x11/wxGTK/Makefile | 15 | ||||
| -rw-r--r-- | x11/wxGTK/distinfo | 4 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-ab | 17 |
3 files changed, 24 insertions, 12 deletions
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile index 46ffc7ae3d3..6cc71743d1a 100644 --- a/x11/wxGTK/Makefile +++ b/x11/wxGTK/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/06/15 16:53:27 drochner Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/29 08:53:17 jlam Exp $ # DISTNAME= wxGTK-2.2.7 @@ -9,10 +9,8 @@ MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.freiburg.linux.de/~wxxt/ COMMENT= GTK-based implementation of the wxWindows GUI library -DEPENDS+= gtk+>=1.2.7:../../x11/gtk -DEPENDS+= jpeg-6b:../../graphics/jpeg -DEPENDS+= png>=1.0.11:../../graphics/png -DEPENDS+= tiff>=3.5.2:../../graphics/tiff +USE_BUILDLINK_ONLY= # defined +REPLACE_BUILDLINK= wxgtk-config USE_GMAKE= # defined USE_LIBTOOL= # defined @@ -24,7 +22,8 @@ CONFIGURE_ARGS+= --with-libpng=sys CONFIGURE_ARGS+= --with-libtiff=sys CONFIGURE_ARGS+= --disable-threads -CPPFLAGS+= -I${LOCALBASE}/include +MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this DOCDIR= ${PREFIX}/share/doc/wx/gtk @@ -33,4 +32,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE ${INSTALL_DATA} ${WRKSRC}/SYMBOLS.txt ${DOCDIR}/SYMBOLS +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../graphics/tiff/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo index 9185b4c81bc..0227f3feca3 100644 --- a/x11/wxGTK/distinfo +++ b/x11/wxGTK/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2001/06/18 05:02:09 jlam Exp $ +$NetBSD: distinfo,v 1.5 2001/06/29 08:53:17 jlam Exp $ SHA1 (wxGTK-2.2.7.tar.gz) = f14685db47581a1024b36fa7611f8838223fff18 Size (wxGTK-2.2.7.tar.gz) = 4732358 bytes SHA1 (patch-aa) = 1aa3a1d065bb03415572440f373fddbefa46e380 -SHA1 (patch-ab) = 6ebbb8a63c2932bb770a123c10f71cff64abf01c +SHA1 (patch-ab) = fe21292a04e35b8c0b1b98a49649eea3ffd700ad SHA1 (patch-ac) = 5dfa4e3c4c7c682f957846da31615d14dc589f3e SHA1 (patch-ad) = 5ed8a10d6d9cb2b0ef05ca053e3efa2030bcde22 diff --git a/x11/wxGTK/patches/patch-ab b/x11/wxGTK/patches/patch-ab index 536b0b05ab7..ff7984b9cfc 100644 --- a/x11/wxGTK/patches/patch-ab +++ b/x11/wxGTK/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.6 2001/06/18 05:02:09 jlam Exp $ +$NetBSD: patch-ab,v 1.7 2001/06/29 08:53:18 jlam Exp $ ---- Makefile.in.orig Tue May 22 16:27:56 2001 -+++ Makefile.in Fri Jun 15 01:07:50 2001 +--- Makefile.in.orig Tue May 22 10:27:56 2001 ++++ Makefile.in @@ -19,13 +19,13 @@ .SUFFIXES: .o .cpp .c .cxx @@ -39,11 +39,20 @@ $NetBSD: patch-ab,v 1.6 2001/06/18 05:02:09 jlam Exp $ top_srcdir = @top_srcdir@ prefix = @prefix@ +@@ -87,7 +83,7 @@ + + DESTDIR = + +-localedir = $(datadir)/locale ++localedir = $(prefix)/${PKGLOCALEDIR}/locale + + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ @@ -95,13 +91,16 @@ top_builddir = . -+EXTRALIBS=-lz -L@prefix@/lib -Wl,-R@prefix@/lib -ljpeg -lpng -ltiff ++EXTRALIBS=${LDFLAGS} -lz -ljpeg -lpng -ltiff + INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ |