aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2004-08-01 00:38:42 +0800
committerfjoe <fjoe@FreeBSD.org>2004-08-01 00:38:42 +0800
commitd31f51aa1c4c161f5fe65e33abef9c3f0c1836c1 (patch)
treebcbf44ba2ddbda96d24491f7b60936bd4a6a9f4f
parent9aea968ad44fc7059611b956e7bc7eb41c5b7278 (diff)
downloadfreebsd-ports-graphics-d31f51aa1c4c161f5fe65e33abef9c3f0c1836c1.tar.gz
freebsd-ports-graphics-d31f51aa1c4c161f5fe65e33abef9c3f0c1836c1.tar.zst
freebsd-ports-graphics-d31f51aa1c4c161f5fe65e33abef9c3f0c1836c1.zip
- wx-config now points to wxgtk2-2.4.config
- Bump PORTREVISION Suggested by: Diane Bruce <db at db dot net>
-rw-r--r--x11-toolkits/wxgtk/Makefile2
-rw-r--r--x11-toolkits/wxgtk/files/patch-ac2
-rw-r--r--x11-toolkits/wxgtk/pkg-plist1
-rw-r--r--x11-toolkits/wxgtk2/Makefile2
-rw-r--r--x11-toolkits/wxgtk2/pkg-plist1
-rw-r--r--x11-toolkits/wxgtk24/Makefile2
-rw-r--r--x11-toolkits/wxgtk24/files/patch-ac2
-rw-r--r--x11-toolkits/wxgtk24/pkg-plist1
8 files changed, 6 insertions, 7 deletions
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 8a878937b17..44d9f0b12d5 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.4.2
-PORTREVISION?= 7
+PORTREVISION?= 8
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
diff --git a/x11-toolkits/wxgtk/files/patch-ac b/x11-toolkits/wxgtk/files/patch-ac
index 9513e8f0e20..b95baddfc8c 100644
--- a/x11-toolkits/wxgtk/files/patch-ac
+++ b/x11-toolkits/wxgtk/files/patch-ac
@@ -99,7 +99,7 @@
+preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
+ $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
-+ @if test "$(WXGTK_FLAVOR)" = "gtk"; then \
++ @if test "$(WXGTK_FLAVOR)" = "gtk2"; then \
+ cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config; \
+ fi
+ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
diff --git a/x11-toolkits/wxgtk/pkg-plist b/x11-toolkits/wxgtk/pkg-plist
index 1db0937a8ce..c4b6537e54b 100644
--- a/x11-toolkits/wxgtk/pkg-plist
+++ b/x11-toolkits/wxgtk/pkg-plist
@@ -1,4 +1,3 @@
-bin/wx-config
bin/wxgtk-2.4-config
include/wx/gtk-2.4/wx/setup.h
lib/libwx_gtk-2.4.so
diff --git a/x11-toolkits/wxgtk2/Makefile b/x11-toolkits/wxgtk2/Makefile
index 62ff2e2ffda..b32bb6fff88 100644
--- a/x11-toolkits/wxgtk2/Makefile
+++ b/x11-toolkits/wxgtk2/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 3
+PORTREVISION= 4
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (GTK2 version)
diff --git a/x11-toolkits/wxgtk2/pkg-plist b/x11-toolkits/wxgtk2/pkg-plist
index 7d5a7f1a22b..31ad6573ae9 100644
--- a/x11-toolkits/wxgtk2/pkg-plist
+++ b/x11-toolkits/wxgtk2/pkg-plist
@@ -1,3 +1,4 @@
+bin/wx-config
bin/wxgtk2-2.4-config
include/wx/gtk2-2.4/wx/setup.h
lib/libwx_gtk2-2.4.so
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 8a878937b17..44d9f0b12d5 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.4.2
-PORTREVISION?= 7
+PORTREVISION?= 8
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
diff --git a/x11-toolkits/wxgtk24/files/patch-ac b/x11-toolkits/wxgtk24/files/patch-ac
index 9513e8f0e20..b95baddfc8c 100644
--- a/x11-toolkits/wxgtk24/files/patch-ac
+++ b/x11-toolkits/wxgtk24/files/patch-ac
@@ -99,7 +99,7 @@
+preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
+ $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
-+ @if test "$(WXGTK_FLAVOR)" = "gtk"; then \
++ @if test "$(WXGTK_FLAVOR)" = "gtk2"; then \
+ cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config; \
+ fi
+ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
diff --git a/x11-toolkits/wxgtk24/pkg-plist b/x11-toolkits/wxgtk24/pkg-plist
index 1db0937a8ce..c4b6537e54b 100644
--- a/x11-toolkits/wxgtk24/pkg-plist
+++ b/x11-toolkits/wxgtk24/pkg-plist
@@ -1,4 +1,3 @@
-bin/wx-config
bin/wxgtk-2.4-config
include/wx/gtk-2.4/wx/setup.h
lib/libwx_gtk-2.4.so