Depend on wxGTK24, bump PKGREVISION.

7 files changed, 24 insertions, 24 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index f717c5f26bf..6f79eb5a114 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2005/07/27 16:21:16 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/07 11:28:07 wiz Exp $
 
 DISTNAME=	audacity-src-1.2.3
 PKGNAME=	audacity-1.2.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=audacity/}
 
@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=	--with-libmad=system
 CONFIGURE_ARGS+=	--with-libsndfile=system
 CONFIGURE_ARGS+=	--with-portaudio=system
 CONFIGURE_ARGS+=	--with-vorbis=system
+CONFIGURE_ENV+=		WX_CONFIG=${LOCALBASE}/bin/wx24-config
 LTCONFIG_OVERRIDE=	${WRKSRC}/lib-src/libsndfile/libtool \
 			${WRKSRC}/lib-src/libsndfile/ltconfig \
 			${WRKSRC}/ltconfig
@@ -36,7 +37,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/lib-src/libsndfile/libtool \
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK24/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 3b38387af2f..1368ee00461 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:45 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/07 11:29:03 wiz Exp $
 #
 
 DISTNAME=	poedit-1.2.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poedit/}
 
@@ -15,8 +15,9 @@ DEPENDS+=	zip-[0-9]*:../../archivers/zip
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake
+CONFIGURE_ENV+=		WX_CONFIG_NAME=${LOCALBASE}/bin/wx24-config
 
 .include "../../databases/db4/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK24/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/wxhugo/Makefile b/games/wxhugo/Makefile
index c5b6cda48af..dddcbead63f 100644
--- a/games/wxhugo/Makefile
+++ b/games/wxhugo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:56 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/07 11:29:27 wiz Exp $
 #
 
 DISTNAME=	hugov31_unix_source
 PKGNAME=	wxhugo-3.1.02
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_IFARCHIVE:=programming/hugo/source/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTFILE_WX}
@@ -28,7 +29,7 @@ SUBST_FILTER_CMD.dos_eol=	${TR} -d '\r'
 INSTALLATION_DIRS=	bin
 
 .include "../../audio/libmikmod/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK24/buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hewx ${PREFIX}/bin
diff --git a/games/wxhugo/distinfo b/games/wxhugo/distinfo
index 1341e03d355..d25a8a54503 100644
--- a/games/wxhugo/distinfo
+++ b/games/wxhugo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/05/07 23:04:17 dillo Exp $
+$NetBSD: distinfo,v 1.6 2005/08/07 11:29:27 wiz Exp $
 
 SHA1 (hugo-3.1.02/hugov31_unix_source.tar.gz) = 7c3785da668e1deb9fe222b6014c402b00fc4256
 RMD160 (hugo-3.1.02/hugov31_unix_source.tar.gz) = 205c3a26456eabe6e72116be6a2120a00e118385
@@ -6,4 +6,4 @@ Size (hugo-3.1.02/hugov31_unix_source.tar.gz) = 214617 bytes
 SHA1 (hugo-3.1.02/hugov31_wxwin_source.tar.gz) = 477ee2d4294b4203b317a3db77015cb23b76a066
 RMD160 (hugo-3.1.02/hugov31_wxwin_source.tar.gz) = 46703c623d82afe9194167572f81a1c20baa4a7f
 Size (hugo-3.1.02/hugov31_wxwin_source.tar.gz) = 284234 bytes
-SHA1 (patch-aa) = 7dfcfa9a642e86551b9c4cf5cc084734f8106866
+SHA1 (patch-aa) = 2387adc51267f0e012224337bb745bb562bc6ff3
diff --git a/games/wxhugo/patches/patch-aa b/games/wxhugo/patches/patch-aa
index 031e0febb01..81942b2dc60 100644
--- a/games/wxhugo/patches/patch-aa
+++ b/games/wxhugo/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2005/05/07 23:04:17 dillo Exp $
+$NetBSD: patch-aa,v 1.5 2005/08/07 11:29:27 wiz Exp $
 
 --- Makefile.orig	2005-01-16 20:25:50.000000000 +0100
 +++ Makefile
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.4 2005/05/07 23:04:17 dillo Exp $
  #LDFLAGS = `wx-config --libs` -lgtk -lgdk -lmikmod

  # Uncomment the following if compiling with GTK 2 support:

 -LDFLAGS = `wx-config --libs` -lgtk-x11-2.0 -lgdk-x11-2.0 -lmikmod

-+LDFLAGS = `wx-config --libs` -lmikmod

++LDFLAGS = `wx24-config --libs` -lmikmod

  

  # Use these LDFLAGS and STATICLIBS for static building:

  #STATICLIBS = /usr/local/lib/libmikmod.a /usr/local/lib/libwx_gtk2-2.4.a

@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.4 2005/05/07 23:04:17 dillo Exp $
  # Release build:

 -CFLAGS  = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -O2 -Wall `wx-config --cflags`

 +CPPFLAGS+=${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET

-+HUGO_CFLAGS=-O2 -Wall `wx-config --cflags`

++HUGO_CFLAGS=-O2 -Wall `wx24-config --cflags`

 +CFLAGS  += ${HUGO_CFLAGS}
  

  # C++

diff --git a/net/amule/Makefile b/net/amule/Makefile
index a1659108983..c70721de8ed 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/07 11:30:49 wiz Exp $
 #
 
 DISTNAME=		aMule-1.2.8
 PKGNAME=		${DISTNAME:S/aMule/amule/}
-PKGREVISION=	3
+PKGREVISION=		4
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amule/}
 EXTRACT_SUFX=		.tar.bz2
@@ -21,6 +21,7 @@ USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-wx-config=${LOCALBASE}/bin/wx24-config
 
 LIBS+=			-lm
 
@@ -31,7 +32,7 @@ UNLIMIT_RESOURCES+=	datasize
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK24/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index 2b3dc139d74..08e60eea896 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/07 11:31:32 wiz Exp $
 #
 
 DISTNAME=	wxPythonSrc-2.4.2.4
 PKGNAME=	${PYPKGPREFIX}-wxWidgets-2.4.2.4
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxpython/}
 
@@ -22,11 +22,7 @@ PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 BUILDLINK_DEPENDS.python21=	python21>=2.1.3nb3
 BUILDLINK_DEPENDS.python22=	python22>=2.2.2nb2
 
-.include "../../mk/bsd.prefs.mk"
-
-.if empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
-WXARG=	WXPORT=gtk2
-.endif
+WXARG=	WXPORT=gtk2 WX_CONFIG=${LOCALBASE}/bin/wx24-config
 
 PYDISTUTILSPKG=	yes
 # no scripts to avoid conflicts
@@ -35,7 +31,7 @@ PYSETUPINSTALLARGS=	NO_SCRIPTS=1 ${WXARG}
 PYBINMODULE=	yes
 
 .include "../../devel/pkg-config/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK24/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"