Skip site navigation (1)Skip section navigation (2)
Date:      Fri,  8 Sep 2000 08:07:42 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/21123: Update port: x11-toolkits/wxgtk to 2.2.1
Message-ID:  <20000908150742.B482637B423@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         21123
>Category:       ports
>Synopsis:       Update port: x11-toolkits/wxgtk to 2.2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 08 08:10:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.2.1

Remove file:
patches/patch-ab

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11-toolkits/wxgtk/Makefile x11-toolkits/wxgtk/Makefile
--- /usr/ports/x11-toolkits/wxgtk/Makefile	Sat Jun 17 09:01:00 2000
+++ x11-toolkits/wxgtk/Makefile	Sat Aug 26 02:22:36 2000
@@ -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 -urN /usr/ports/x11-toolkits/wxgtk/files/md5 x11-toolkits/wxgtk/files/md5
--- /usr/ports/x11-toolkits/wxgtk/files/md5	Fri Jun 16 21:58:40 2000
+++ x11-toolkits/wxgtk/files/md5	Wed Aug 23 04:29:01 2000
@@ -1 +1 @@
-MD5 (wxGTK-2.1.16.tgz) = 4a86bde2cdb2e94792167848f438a829
+MD5 (wxGTK-2.2.1.tar.gz) = b5d92f8e103477b906176e0451086f07
diff -urN /usr/ports/x11-toolkits/wxgtk/patches/patch-aa x11-toolkits/wxgtk/patches/patch-aa
--- /usr/ports/x11-toolkits/wxgtk/patches/patch-aa	Mon May 22 21:53:03 2000
+++ x11-toolkits/wxgtk/patches/patch-aa	Sat Aug 26 02:03:48 2000
@@ -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 -urN /usr/ports/x11-toolkits/wxgtk/patches/patch-ab x11-toolkits/wxgtk/patches/patch-ab
--- /usr/ports/x11-toolkits/wxgtk/patches/patch-ab	Mon May 22 21:53:05 2000
+++ x11-toolkits/wxgtk/patches/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,22 +0,0 @@
---- configure.orig	Wed Mar 22 13:12:37 2000
-+++ configure	Sun Apr 23 08:05:23 2000
-@@ -8682,15 +8682,11 @@
- WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
- WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
- 
--WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
--WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
-+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
- 
--WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
--WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
--WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
--WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
-+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
-+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
- 
- SHARED_LD=
- PIC_FLAG=
diff -urN /usr/ports/x11-toolkits/wxgtk/pkg/PLIST x11-toolkits/wxgtk/pkg/PLIST
--- /usr/ports/x11-toolkits/wxgtk/pkg/PLIST	Fri Jun 16 21:58:42 2000
+++ x11-toolkits/wxgtk/pkg/PLIST	Sat Aug 26 01:54:40 2000
@@ -323,6 +323,13 @@
 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


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000908150742.B482637B423>