diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2000-09-10 22:07:20 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2000-09-10 22:07:20 +0000 |
| commit | 55616103bde31f1297e397f2cf998ae49d7cf2f4 (patch) | |
| tree | 305027cbbd235d24ffacce7c4d64903e75d1a5c2 /x11-toolkits/wxgtk | |
| parent | Improve the configure script and add a knob to use another version of (diff) | |
Update 2.1.16 -> 2.2.1
PR: ports/21123
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=32498
Diffstat (limited to 'x11-toolkits/wxgtk')
| -rw-r--r-- | x11-toolkits/wxgtk/Makefile | 31 | ||||
| -rw-r--r-- | x11-toolkits/wxgtk/distinfo | 2 | ||||
| -rw-r--r-- | x11-toolkits/wxgtk/files/patch-aa | 35 | ||||
| -rw-r--r-- | x11-toolkits/wxgtk/pkg-plist | 7 |
4 files changed, 50 insertions, 25 deletions
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile index 755f995179fd..33703da99e23 100644 --- a/x11-toolkits/wxgtk/Makefile +++ b/x11-toolkits/wxgtk/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: wxGTK +# New ports collection makefile for: wxGTK # Date created: September 18, 1999 # Whom: nectar@FreeBSD.ORG # @@ -6,31 +6,24 @@ # PORTNAME= wxgtk -PORTVERSION= 2.1.16 +PORTVERSION= 2.2.1 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \ - http://netfx-2000.linux.tucows.com/files/x11/dev/ \ - http://linuxberg.is.co.za/files/x11/dev/ \ - http://cyberec.linux.tucows.com/files/x11/dev/ \ - http://gil.linux.tucows.com/files/x11/dev/ \ - http://cyberbeach.linux.tucows.com/files/x11/dev/ \ - http://bonn.linux.tucows.com/files/x11/dev/ \ - http://matrix.linux.tucows.com/files/x11/dev/ +MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ DISTNAME= wxGTK-${PORTVERSION} -EXTRACT_SUFX= .tgz -MAINTAINER= nectar@FreeBSD.ORG +MAINTAINER= nectar@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -USE_X_PREFIX= yes -INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_NEWGCC= yes - WRKSRC= ${WRKDIR}/wxGTK -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +USE_X_PREFIX= yes +USE_NEWGCC= yes +USE_GMAKE= yes +USE_AUTOCONF= yes +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +INSTALLS_SHLIB= yes .include <bsd.port.mk> diff --git a/x11-toolkits/wxgtk/distinfo b/x11-toolkits/wxgtk/distinfo index b21ed85a37a9..d217ee28748c 100644 --- a/x11-toolkits/wxgtk/distinfo +++ b/x11-toolkits/wxgtk/distinfo @@ -1 +1 @@ -MD5 (wxGTK-2.1.16.tgz) = 4a86bde2cdb2e94792167848f438a829 +MD5 (wxGTK-2.2.1.tar.gz) = b5d92f8e103477b906176e0451086f07 diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa index fb3c109b989b..a7cf0245b477 100644 --- a/x11-toolkits/wxgtk/files/patch-aa +++ b/x11-toolkits/wxgtk/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.in.orig Sun Apr 23 07:59:54 2000 -+++ configure.in Sun Apr 23 08:04:06 2000 -@@ -1974,16 +1974,12 @@ +--- configure.in.orig Sun Aug 20 17:52:52 2000 ++++ configure.in Sat Aug 26 02:03:38 2000 +@@ -1999,16 +1999,12 @@ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a" dnl the name of the shared library @@ -21,7 +21,32 @@ dnl shared library settings SHARED_LD= -@@ -3645,8 +3641,6 @@ +@@ -2742,24 +2738,6 @@ + fi + fi + +- +-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` +-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` +-if test "$wxUSE_OPTIMISE" = "no" ; then +- OPTIMISE= +-else +- if test "$GCC" = yes ; then +- OPTIMISE="-O2" +- case "${host}" in +- i586-*-*|i686-*-* ) +- OPTIMISE="${OPTIMISE} " +- ;; +- esac +- else +- OPTIMISE="-O" +- fi +-fi +- + dnl --------------------------------------------------------------------------- + dnl Optional libraries + dnl --------------------------------------------------------------------------- +@@ -3784,8 +3762,6 @@ AC_SUBST(WX_LIBRARY) AC_SUBST(WX_TARGET_LIBRARY) AC_SUBST(WX_LIBRARY_LINK1) @@ -30,7 +55,7 @@ AC_SUBST(PROGRAM_EXT) dnl global gl options -@@ -3656,8 +3650,6 @@ +@@ -3795,8 +3771,6 @@ AC_SUBST(WX_LIBRARY_GL) AC_SUBST(WX_TARGET_LIBRARY_GL) AC_SUBST(WX_LIBRARY_LINK1_GL) diff --git a/x11-toolkits/wxgtk/pkg-plist b/x11-toolkits/wxgtk/pkg-plist index f41a446f8c2d..87448542e311 100644 --- a/x11-toolkits/wxgtk/pkg-plist +++ b/x11-toolkits/wxgtk/pkg-plist @@ -323,6 +323,13 @@ include/wx/zstream.h lib/libwx_gtk.so lib/libwx_gtk.so.2 lib/wx/include/wx/gtk/setup.h +share/locale/cs/LC_MESSAGES/wxstd.mo +share/locale/da/LC_MESSAGES/wxstd.mo +share/locale/de/LC_MESSAGES/wxstd.mo +share/locale/fi/LC_MESSAGES/wxstd.mo +share/locale/fr/LC_MESSAGES/wxstd.mo +share/locale/it/LC_MESSAGES/wxstd.mo +share/locale/ru/LC_MESSAGES/wxstd.mo share/wx/afm/Cour.afm share/wx/afm/CourBo.afm share/wx/afm/CourBoO.afm |