[pkgsrc/trunk]: pkgsrc Depend on wxGTK24, bump PKGREVISION.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Depend on wxGTK24, bump PKGREVISION.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:09:40 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ebf3c36fe41
branches:  trunk
changeset: 497905:4ebf3c36fe41
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Aug 07 11:28:07 2005 +0000

description:
Depend on wxGTK24, bump PKGREVISION.

diffstat:

 audio/audacity/Makefile       |   7 ++++---
 editors/poedit/Makefile       |   7 ++++---
 games/wxhugo/Makefile         |   5 +++--
 games/wxhugo/distinfo         |   4 ++--
 games/wxhugo/patches/patch-aa |   6 +++---
 net/amule/Makefile            |   7 ++++---
 x11/py-wxWidgets/Makefile     |  12 ++++--------
 7 files changed, 24 insertions(+), 24 deletions(-)

diffs (190 lines):

diff -r 56786de00dd3 -r 4ebf3c36fe41 audio/audacity/Makefile
--- a/audio/audacity/Makefile   Sun Aug 07 11:27:28 2005 +0000
+++ b/audio/audacity/Makefile   Sun Aug 07 11:28:07 2005 +0000
@@ -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-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 @@
 .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 -r 56786de00dd3 -r 4ebf3c36fe41 editors/poedit/Makefile
--- a/editors/poedit/Makefile   Sun Aug 07 11:27:28 2005 +0000
+++ b/editors/poedit/Makefile   Sun Aug 07 11:28:07 2005 +0000
@@ -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 @@
 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 -r 56786de00dd3 -r 4ebf3c36fe41 games/wxhugo/Makefile
--- a/games/wxhugo/Makefile     Sun Aug 07 11:27:28 2005 +0000
+++ b/games/wxhugo/Makefile     Sun Aug 07 11:28:07 2005 +0000
@@ -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 @@
 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 -r 56786de00dd3 -r 4ebf3c36fe41 games/wxhugo/distinfo
--- a/games/wxhugo/distinfo     Sun Aug 07 11:27:28 2005 +0000
+++ b/games/wxhugo/distinfo     Sun Aug 07 11:28:07 2005 +0000
@@ -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 @@
 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 -r 56786de00dd3 -r 4ebf3c36fe41 games/wxhugo/patches/patch-aa
--- a/games/wxhugo/patches/patch-aa     Sun Aug 07 11:27:28 2005 +0000
+++ b/games/wxhugo/patches/patch-aa     Sun Aug 07 11:28:07 2005 +0000
@@ -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 @@
  #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 @@
  # 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 -r 56786de00dd3 -r 4ebf3c36fe41 net/amule/Makefile
--- a/net/amule/Makefile        Sun Aug 07 11:27:28 2005 +0000
+++ b/net/amule/Makefile        Sun Aug 07 11:28:07 2005 +0000
@@ -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_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-wx-config=${LOCALBASE}/bin/wx24-config
 
 LIBS+=                 -lm
 
@@ -31,7 +32,7 @@
 .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 -r 56786de00dd3 -r 4ebf3c36fe41 x11/py-wxWidgets/Makefile
--- a/x11/py-wxWidgets/Makefile Sun Aug 07 11:27:28 2005 +0000
+++ b/x11/py-wxWidgets/Makefile Sun Aug 07 11:28:07 2005 +0000
@@ -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 @@
 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 @@
 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"
Prev by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Don't be too strict to the "wip...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated audio/libcddb to 1.2.1
Previous by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Don't be too strict to the "wip...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated audio/libcddb to 1.2.1
Indexes:
Home | Main Index | Thread Index | Old Index