diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-06-11 22:26:49 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-06-11 22:26:49 +0000 |
commit | 38c2447dd0bda3f974eb9954c374780b354741ae (patch) | |
tree | ee9bebfc120238c4f0523943750df71af3c9a84e /net/xmule | |
parent | Improve detection on whether wxgtk was built against gtk12 or gtk20 (diff) |
o After repo copy from ports/net/lmule (this is a fork of lmule):
update to xmule version 1.4.0
o Special thanks to [1] who helped patching the application for
FreeBSD
Reviewed by: Lauri Watts <lauri@fruitsalad.org>,
Frerich Raabe <frerich.raabe@gmx.de> [1]
Repo copy approved by: portmgr (self)
Repo copied by: cvs (joe)
Notes
Notes:
svn path=/head/; revision=82815
Diffstat (limited to 'net/xmule')
-rw-r--r-- | net/xmule/Makefile | 19 | ||||
-rw-r--r-- | net/xmule/distinfo | 2 | ||||
-rw-r--r-- | net/xmule/files/patch-configure | 28 | ||||
-rw-r--r-- | net/xmule/files/patch-src::ED2KLink.cpp | 19 |
4 files changed, 36 insertions, 32 deletions
diff --git a/net/xmule/Makefile b/net/xmule/Makefile index de7e73d74fda..bb8d2ea5f263 100644 --- a/net/xmule/Makefile +++ b/net/xmule/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: lmule +# New ports collection makefile for: xmule # Date created: Tue Mar 11 05:06:20 UTC 2003 # Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # # $FreeBSD$ # -PORTNAME= lmule -PORTVERSION= 1.2.1 +PORTNAME= xmule +PORTVERSION= 1.4.0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= lmule +MASTER_SITE_SUBDIR= xmule MAINTAINER= lioux@FreeBSD.org COMMENT= Port of eMule eDonkey P2P client using wxWindows class library @@ -20,6 +20,7 @@ LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \ RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget USE_X_PREFIX= yes +USE_BZIP2= yes USE_GNOME= gnomehier \ gnomehack \ gnomeprefix @@ -32,13 +33,17 @@ CONFIGURE_ARGS= --without-included-gettext \ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" -WX_CONFIG?= "${X11BASE}/bin/wx-config" +WX_CONFIG?= ${X11BASE}/bin/wx-config post-patch: # it works for FreeBSD as well @${REINPLACE_CMD} -E \ -e 's|(Linux)|FreeBSD/\1|' \ ${WRKSRC}/src/*.cpp +# remove ^M + @${REINPLACE_CMD} -E \ + -e 's|
||' \ + ${WRKSRC}/src/MD5Sum.cpp pre-configure: @${FIND} ${WRKSRC} -type f -name "Makefile.in" | \ @@ -53,12 +58,12 @@ post-install: .if exists(${WX_CONFIG}) # detect if wxgtk was linked against gtk1 or gtk2 -DECISION_GTK_1_OR_2!= ${WX_CONFIG} --cppflags +DECISION_GTK_1_OR_2!= ${WX_CONFIG} --static --libs .else DECISION_GTK_1_OR_2= "" .endif -.if (${DECISION_GTK_1_OR_2:Mgtk2} != "") +.if ${DECISION_GTK_1_OR_2:M*glib-2.0} != "" USE_GNOME+= gtk20 .else USE_GNOME+= gtk12 diff --git a/net/xmule/distinfo b/net/xmule/distinfo index 53c6807226d1..1f49d0e36b1f 100644 --- a/net/xmule/distinfo +++ b/net/xmule/distinfo @@ -1 +1 @@ -MD5 (lmule-1.2.1.tar.gz) = ef0efe29860873fd11a838d5c1d01a84 +MD5 (xmule-1.4.0.tar.bz2) = f63d4f84479c4e0ef625c054e6cbed10 diff --git a/net/xmule/files/patch-configure b/net/xmule/files/patch-configure index a0cca454fc69..b58f27461f1e 100644 --- a/net/xmule/files/patch-configure +++ b/net/xmule/files/patch-configure @@ -1,11 +1,29 @@ ---- configure.orig Sat Mar 29 14:13:57 2003 -+++ configure Sat Mar 29 14:14:04 2003 -@@ -1710,8 +1710,6 @@ +--- configure.orig Mon May 26 22:56:09 2003 ++++ configure Tue May 27 17:55:59 2003 +@@ -1712,8 +1712,6 @@ # Checks for programs. # hopefully this prevents -O2 --CXXFLAGS="-g" --CFLAGS="-g" +-CXXFLAGS="-g -rdynamic" +-CFLAGS="-g -rdynamic" ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -7149,7 +7147,7 @@ + + echo "$as_me:$LINENO: checking if wxWindows was linked with GTK2" >&5 + echo $ECHO_N "checking if wxWindows was linked with GTK2... $ECHO_C" >&6 +- if $WX_CONFIG_NAME --cppflags | grep -q 'gtk2' ; then ++ if $WX_CONFIG_NAME --static --libs | grep -q 'glib-2' ; then + GTK_USEDVERSION=2 + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +@@ -7161,7 +7159,7 @@ + + + +-if test x$GTK_USEDVERSION == x2 ; then ++if test x$GTK_USEDVERSION = x2 ; then + # Check whether --enable-gtktest or --disable-gtktest was given. + if test "${enable_gtktest+set}" = set; then + enableval="$enable_gtktest" diff --git a/net/xmule/files/patch-src::ED2KLink.cpp b/net/xmule/files/patch-src::ED2KLink.cpp index 09e43be239b2..e69de29bb2d1 100644 --- a/net/xmule/files/patch-src::ED2KLink.cpp +++ b/net/xmule/files/patch-src::ED2KLink.cpp @@ -1,19 +0,0 @@ ---- src/ED2KLink.cpp.orig Sun May 11 11:53:58 2003 -+++ src/ED2KLink.cpp Sun May 11 11:57:00 2003 -@@ -216,6 +216,8 @@ - pEnd = pCh; - while( *pEnd ) pEnd++; // make pEnd point to the terminating NULL - bAllowSources=true; -+// This code segment does not work with gcc 3.x. At least, under FreeBSD. -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500035 - // if there's an expiration date... - if( *pCh == _T('@') && (pEnd-pCh) > 7 ) - { -@@ -230,6 +232,7 @@ - bAllowSources = ( expirationDate.Set(nYear,(wxDateTime::Month)nMonth,nDay,0,0,0,0) == 0l); - if (bAllowSources) bAllowSources=(wxDateTime::UNow() < expirationDate); - } -+#endif - - // increment pCh to point to the first "ip:port" and check for sources - if ( bAllowSources && ++pCh < pEnd ) { |