Index: head/x11-toolkits/wxgtk-devel/Makefile =================================================================== --- head/x11-toolkits/wxgtk-devel/Makefile (revision 90344) +++ head/x11-toolkits/wxgtk-devel/Makefile (revision 90345) @@ -1,72 +1,73 @@ # New ports collection makefile for: wxGTK # Date created: September 18, 1999 # Whom: nectar@FreeBSD.ORG # # $FreeBSD$ # PORTNAME= wxgtk PORTVERSION= 2.4.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ MASTER_SITE_SUBDIR= wxwindows DISTNAME= wxGTK-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= The wxWindows GUI toolkit with GTK+ bindings (unstable version) LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ iconv.3:${PORTSDIR}/converters/libiconv USE_BZIP2= yes USE_X_PREFIX= yes USE_MESA= yes USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ --with-zlib=sys \ --with-opengl CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} \ -I${WRKSRC}/include \ -I${LOCALBASE}/include \ -I${X11BASE}/include" \ LDFLAGS="${PTHREAD_LIBS} \ -L${LOCALBASE}/lib -liconv \ -L${X11BASE}/lib" .include .if defined(WITH_GTK2) USE_GNOME= gtk20 CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL} .else USE_GNOME= gtk12 CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET} .endif pre-everything: .if !defined(WITH_GTK2) @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" @${ECHO_MSG} "You can define WITH_GTK2=yes if you want to use Gtk20 toolkit." @${ECHO_MSG} "This is marked as experimental by wxGTK authors." @${ECHO_MSG} "Note: applications already linked to Gtk12 wxGTK will no longer work." @${ECHO_MSG} " You have to rebuild them by hand." @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *" .endif pre-patch: @${REINPLACE_CMD} -e 's|[$$]THREADS_LINK|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure .if defined(WITH_GTK2) @${REINPLACE_CMD} -e 's|lgdk|lgdk-x11-2.0|g' ${WRKSRC}/configure .else @${REINPLACE_CMD} -e 's|lgdk|lgdk12|g' ${WRKSRC}/configure .endif .include Property changes on: head/x11-toolkits/wxgtk-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.43 \ No newline at end of property +1.44 \ No newline at end of property Index: head/x11-toolkits/wxgtk-devel/files/patch-src_common_intl.cpp =================================================================== --- head/x11-toolkits/wxgtk-devel/files/patch-src_common_intl.cpp (nonexistent) +++ head/x11-toolkits/wxgtk-devel/files/patch-src_common_intl.cpp (revision 90345) @@ -0,0 +1,22 @@ +--- src/common/intl.cpp.orig Sat Oct 4 23:10:24 2003 ++++ src/common/intl.cpp Sun Oct 5 21:35:30 2003 +@@ -743,8 +742,18 @@ + } + if ( !retloc ) + { ++ wxString langFull; ++ if (wxGetEnv(wxT("LC_ALL"), &langFull)|| ++ wxGetEnv(wxT("LC_MESSAGES"), &langFull) || ++ wxGetEnv(wxT("LANG"), &langFull)) ++ { ++ retloc = wxSetlocale(LC_ALL, langFull); ++ } ++ } ++ if ( !retloc ) ++ { + wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str()); +- return FALSE; ++ //return FALSE; + } + #elif defined(__WIN32__) + Property changes on: head/x11-toolkits/wxgtk-devel/files/patch-src_common_intl.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property