diff options
24 files changed, 72 insertions, 9 deletions
diff --git a/x11-toolkits/wxgtk24-contrib/Makefile b/x11-toolkits/wxgtk24-contrib/Makefile index 0b2963ab4e33..03acdc2152da 100644 --- a/x11-toolkits/wxgtk24-contrib/Makefile +++ b/x11-toolkits/wxgtk24-contrib/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 5 +PORTREVISION= 6 MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index eb114972717c..d628726e77b0 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.4.2 -PORTREVISION?= 11 +PORTREVISION?= 12 PKGNAMESUFFIX= ${WXGTK_FLAVOR} CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -41,7 +41,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include \ ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -liconv \ -L${X11BASE}/lib \ - ${PTHREAD_LIBS}" + ${PTHREAD_LIBS}"\ + X11BASE="${X11BASE}" NO_LATEST_LINK= yes PLIST= ${.CURDIR}/pkg-plist diff --git a/x11-toolkits/wxgtk24/files/patch-configure b/x11-toolkits/wxgtk24/files/patch-configure index 2236f9edacee..9fb5e6e49d9b 100644 --- a/x11-toolkits/wxgtk24/files/patch-configure +++ b/x11-toolkits/wxgtk24/files/patch-configure @@ -1,5 +1,13 @@ --- configure.orig Tue Nov 4 19:54:04 2003 +++ configure Tue Nov 4 20:12:59 2003 +@@ -11436,6 +11436,7 @@ + + + SEARCH_INCLUDE="\ ++ $X11BASE/include \ + /usr/local/include \ + \ + /usr/Motif-1.2/include \ @@ -11731,7 +11731,7 @@ diff --git a/x11-toolkits/wxgtk26-common/Makefile b/x11-toolkits/wxgtk26-common/Makefile index 1bdbb9c01952..3ad84ec3dd16 100644 --- a/x11-toolkits/wxgtk26-common/Makefile +++ b/x11-toolkits/wxgtk26-common/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit (common files) diff --git a/x11-toolkits/wxgtk26-contrib-common/Makefile b/x11-toolkits/wxgtk26-contrib-common/Makefile index 58d6c54ebe6c..c6a8b454f5fd 100644 --- a/x11-toolkits/wxgtk26-contrib-common/Makefile +++ b/x11-toolkits/wxgtk26-contrib-common/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries (common files) diff --git a/x11-toolkits/wxgtk26-contrib/Makefile b/x11-toolkits/wxgtk26-contrib/Makefile index 1eba77011e9f..8140c66d479d 100644 --- a/x11-toolkits/wxgtk26-contrib/Makefile +++ b/x11-toolkits/wxgtk26-contrib/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries diff --git a/x11-toolkits/wxgtk26-unicode-contrib/Makefile b/x11-toolkits/wxgtk26-unicode-contrib/Makefile index 62f0029a5019..441dcac0ca36 100644 --- a/x11-toolkits/wxgtk26-unicode-contrib/Makefile +++ b/x11-toolkits/wxgtk26-unicode-contrib/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode) diff --git a/x11-toolkits/wxgtk26-unicode/Makefile b/x11-toolkits/wxgtk26-unicode/Makefile index e08c74598646..cb6c798a331a 100644 --- a/x11-toolkits/wxgtk26-unicode/Makefile +++ b/x11-toolkits/wxgtk26-unicode/Makefile @@ -5,10 +5,11 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit (Unicode) -PORTREVISION= 1 WXGTK_FLAVOR= gtk2-unicode MASTERDIR= ${.CURDIR}/../wxgtk26 diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile index 7cb920ef7080..e18ec9b66633 100644 --- a/x11-toolkits/wxgtk26/Makefile +++ b/x11-toolkits/wxgtk26/Makefile @@ -45,7 +45,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ LDFLAGS="-L${LOCALBASE}/lib -liconv \ -L${X11BASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="${PTHREAD_LIBS}"\ + X11BASE="${X11BASE}" PLIST= ${.CURDIR}/pkg-plist WXGTK_FLAVOR?= gtk2 diff --git a/x11-toolkits/wxgtk26/files/patch-configure b/x11-toolkits/wxgtk26/files/patch-configure index 33327df196a0..b3cf594f3ac9 100644 --- a/x11-toolkits/wxgtk26/files/patch-configure +++ b/x11-toolkits/wxgtk26/files/patch-configure @@ -1,5 +1,13 @@ --- configure.orig Thu Jun 2 23:03:05 2005 +++ configure Wed Aug 31 23:48:02 2005 +@@ -23409,6 +23409,7 @@ + + + SEARCH_INCLUDE="\ ++ $X11BASE/include \ + /usr/local/include \ + \ + /usr/Motif-2.1/include \ @@ -34396,7 +34396,7 @@ fi ;; diff --git a/x11-toolkits/wxgtk28-common/Makefile b/x11-toolkits/wxgtk28-common/Makefile index 1bdbb9c01952..3ad84ec3dd16 100644 --- a/x11-toolkits/wxgtk28-common/Makefile +++ b/x11-toolkits/wxgtk28-common/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit (common files) diff --git a/x11-toolkits/wxgtk28-contrib-common/Makefile b/x11-toolkits/wxgtk28-contrib-common/Makefile index 58d6c54ebe6c..c6a8b454f5fd 100644 --- a/x11-toolkits/wxgtk28-contrib-common/Makefile +++ b/x11-toolkits/wxgtk28-contrib-common/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries (common files) diff --git a/x11-toolkits/wxgtk28-contrib/Makefile b/x11-toolkits/wxgtk28-contrib/Makefile index 1eba77011e9f..8140c66d479d 100644 --- a/x11-toolkits/wxgtk28-contrib/Makefile +++ b/x11-toolkits/wxgtk28-contrib/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries diff --git a/x11-toolkits/wxgtk28-unicode-contrib/Makefile b/x11-toolkits/wxgtk28-unicode-contrib/Makefile index 62f0029a5019..441dcac0ca36 100644 --- a/x11-toolkits/wxgtk28-unicode-contrib/Makefile +++ b/x11-toolkits/wxgtk28-unicode-contrib/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode) diff --git a/x11-toolkits/wxgtk28-unicode/Makefile b/x11-toolkits/wxgtk28-unicode/Makefile index e08c74598646..cb6c798a331a 100644 --- a/x11-toolkits/wxgtk28-unicode/Makefile +++ b/x11-toolkits/wxgtk28-unicode/Makefile @@ -5,10 +5,11 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit (Unicode) -PORTREVISION= 1 WXGTK_FLAVOR= gtk2-unicode MASTERDIR= ${.CURDIR}/../wxgtk26 diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 7cb920ef7080..e18ec9b66633 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -45,7 +45,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ LDFLAGS="-L${LOCALBASE}/lib -liconv \ -L${X11BASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="${PTHREAD_LIBS}"\ + X11BASE="${X11BASE}" PLIST= ${.CURDIR}/pkg-plist WXGTK_FLAVOR?= gtk2 diff --git a/x11-toolkits/wxgtk28/files/patch-configure b/x11-toolkits/wxgtk28/files/patch-configure index 33327df196a0..b3cf594f3ac9 100644 --- a/x11-toolkits/wxgtk28/files/patch-configure +++ b/x11-toolkits/wxgtk28/files/patch-configure @@ -1,5 +1,13 @@ --- configure.orig Thu Jun 2 23:03:05 2005 +++ configure Wed Aug 31 23:48:02 2005 +@@ -23409,6 +23409,7 @@ + + + SEARCH_INCLUDE="\ ++ $X11BASE/include \ + /usr/local/include \ + \ + /usr/Motif-2.1/include \ @@ -34396,7 +34396,7 @@ fi ;; diff --git a/x11-toolkits/wxgtk29-common/Makefile b/x11-toolkits/wxgtk29-common/Makefile index 1bdbb9c01952..3ad84ec3dd16 100644 --- a/x11-toolkits/wxgtk29-common/Makefile +++ b/x11-toolkits/wxgtk29-common/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit (common files) diff --git a/x11-toolkits/wxgtk29-contrib-common/Makefile b/x11-toolkits/wxgtk29-contrib-common/Makefile index 58d6c54ebe6c..c6a8b454f5fd 100644 --- a/x11-toolkits/wxgtk29-contrib-common/Makefile +++ b/x11-toolkits/wxgtk29-contrib-common/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries (common files) diff --git a/x11-toolkits/wxgtk29-contrib/Makefile b/x11-toolkits/wxgtk29-contrib/Makefile index 1eba77011e9f..8140c66d479d 100644 --- a/x11-toolkits/wxgtk29-contrib/Makefile +++ b/x11-toolkits/wxgtk29-contrib/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries diff --git a/x11-toolkits/wxgtk29-unicode-contrib/Makefile b/x11-toolkits/wxgtk29-unicode-contrib/Makefile index 62f0029a5019..441dcac0ca36 100644 --- a/x11-toolkits/wxgtk29-unicode-contrib/Makefile +++ b/x11-toolkits/wxgtk29-unicode-contrib/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode) diff --git a/x11-toolkits/wxgtk29-unicode/Makefile b/x11-toolkits/wxgtk29-unicode/Makefile index e08c74598646..cb6c798a331a 100644 --- a/x11-toolkits/wxgtk29-unicode/Makefile +++ b/x11-toolkits/wxgtk29-unicode/Makefile @@ -5,10 +5,11 @@ # $FreeBSD$ # +PORTREVISION= 1 + MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit (Unicode) -PORTREVISION= 1 WXGTK_FLAVOR= gtk2-unicode MASTERDIR= ${.CURDIR}/../wxgtk26 diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile index 7cb920ef7080..e18ec9b66633 100644 --- a/x11-toolkits/wxgtk29/Makefile +++ b/x11-toolkits/wxgtk29/Makefile @@ -45,7 +45,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ LDFLAGS="-L${LOCALBASE}/lib -liconv \ -L${X11BASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="${PTHREAD_LIBS}"\ + X11BASE="${X11BASE}" PLIST= ${.CURDIR}/pkg-plist WXGTK_FLAVOR?= gtk2 diff --git a/x11-toolkits/wxgtk29/files/patch-configure b/x11-toolkits/wxgtk29/files/patch-configure index 33327df196a0..b3cf594f3ac9 100644 --- a/x11-toolkits/wxgtk29/files/patch-configure +++ b/x11-toolkits/wxgtk29/files/patch-configure @@ -1,5 +1,13 @@ --- configure.orig Thu Jun 2 23:03:05 2005 +++ configure Wed Aug 31 23:48:02 2005 +@@ -23409,6 +23409,7 @@ + + + SEARCH_INCLUDE="\ ++ $X11BASE/include \ + /usr/local/include \ + \ + /usr/Motif-2.1/include \ @@ -34396,7 +34396,7 @@ fi ;; |