ports/58956: [non-maintainer] net/xmule wxgtk change

[Pav Lucistnik]

>Number:         58956
>Category:       ports
>Synopsis:       [non-maintainer] net/xmule wxgtk change
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 05 05:00:38 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Pav Lucistnik
>Release:        FreeBSD 4.9-RC i386
>Organization:
>Environment:
System: FreeBSD pav.hide.vol.cz 4.9-RC FreeBSD 4.9-RC #0: Mon Oct 6 20:09:54 CEST 2003 root at pav.hide.vol.cz:/usr/obj/usr/src/sys/PAV i386


	
>Description:
Change net/xmule to use gtk2 version of wxWindows.
>How-To-Repeat:
	
>Fix:

diff -ruN /usr/ports/net/xmule/Makefile xmule/Makefile
--- /usr/ports/net/xmule/Makefile	Wed Nov  5 10:44:45 2003
+++ xmule/Makefile	Wed Nov  5 12:05:35 2003
@@ -19,7 +19,7 @@
 
 LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
 		expat.4:${PORTSDIR}/textproc/expat2 \
-		wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk-devel
+		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 USE_X_PREFIX=	yes
@@ -32,12 +32,10 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
-		--with-wx-config=${WX_CONFIG}
+		--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-WX_CONFIG?=	${X11BASE}/bin/wx-config
-
 post-patch:
 # it works for FreeBSD as well
 	@${REINPLACE_CMD} -E \
@@ -73,19 +71,4 @@
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/ed2k \
 		${PREFIX}/bin/${PORTNAME}-ed2k-handler
 
-.include <bsd.port.pre.mk>
-
-.if exists(${WX_CONFIG})
-# detect if wxgtk was linked against gtk1 or gtk2
-DECISION_GTK_1_OR_2!=	${WX_CONFIG} --static --libs
-.else
-DECISION_GTK_1_OR_2=	""
-.endif
-
-.if ${DECISION_GTK_1_OR_2:M*glib-2.0} != ""
-USE_GNOME+=	gtk20
-.else
-USE_GNOME+=	gtk12
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted: