diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2004-04-29 02:48:07 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2004-04-29 02:48:07 +0000 |
| commit | ff135ea8352ba41637f6868f01774d7ae3db372b (patch) | |
| tree | f9ea76c161fd100eb654b97d118cb78f318b9e66 /net/xmule | |
| parent | - update to 1.2.2 (diff) | |
o Update to 1.8.2
o Remove BROKEN since this version no longer SIGSEVs during initial
trials
o Uphold C{C,XX}
Notes
Notes:
svn path=/head/; revision=107907
Diffstat (limited to 'net/xmule')
| -rw-r--r-- | net/xmule/Makefile | 14 | ||||
| -rw-r--r-- | net/xmule/distinfo | 4 | ||||
| -rw-r--r-- | net/xmule/files/patch-Preferences.cpp | 11 | ||||
| -rw-r--r-- | net/xmule/files/patch-src::otherfunctions.cpp | 11 |
4 files changed, 13 insertions, 27 deletions
diff --git a/net/xmule/Makefile b/net/xmule/Makefile index c14f1e59bef2..8b0f2caa1425 100644 --- a/net/xmule/Makefile +++ b/net/xmule/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xmule -PORTVERSION= 1.8.1 +PORTVERSION= 1.8.2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= xmule @@ -18,8 +18,6 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget -BROKEN= SIGSEGVs too easily. Help to fix it is highly appreciated - USE_GETTEXT= yes USE_X_PREFIX= yes USE_BZIP2= yes @@ -37,12 +35,16 @@ CONFIGURE_ARGS= --without-included-gettext \ --with-wx-config=${WX_CONFIG} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +MAKE_ENV= CC="${CC}" CXX="${CXX}" # for debugging purposes STRIP= WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config +FILES_ATOLL_PATCH= src/Preferences.cpp \ + src/otherfunctions.cpp + post-patch: # it works for FreeBSD as well @${REINPLACE_CMD} -E \ @@ -59,6 +61,12 @@ post-patch: @${REINPLACE_CMD} -E \ -e 's|cp -p|${INSTALL_DATA}|' \ ${WRKSRC}/po/Makefile.in.in +# use correct FreeBSD atoll() prototype +.for file in ${FILES_ATOLL_PATCH} + @${REINPLACE_CMD} -E \ + -e 's|atoll[[:space:]]*\([[:space:]]*char|atoll(const char|' \ + ${WRKSRC}/${file} +.endfor pre-configure: @${FIND} ${WRKSRC} -type f -name "Makefile.in" | \ diff --git a/net/xmule/distinfo b/net/xmule/distinfo index 7db20629c8ac..3ab85ca13aea 100644 --- a/net/xmule/distinfo +++ b/net/xmule/distinfo @@ -1,2 +1,2 @@ -MD5 (xmule-1.8.1.tar.bz2) = 7b385558338e4823cbc971456cd075fe -SIZE (xmule-1.8.1.tar.bz2) = 1166348 +MD5 (xmule-1.8.2.tar.bz2) = 4d87272ba1a224e78a9368986bb4510e +SIZE (xmule-1.8.2.tar.bz2) = 1177837 diff --git a/net/xmule/files/patch-Preferences.cpp b/net/xmule/files/patch-Preferences.cpp deleted file mode 100644 index 5498ca235889..000000000000 --- a/net/xmule/files/patch-Preferences.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Preferences.cpp.orig Tue Sep 9 00:56:24 2003 -+++ src/Preferences.cpp Tue Sep 9 00:56:21 2003 -@@ -60,7 +60,7 @@ - #endif - - #ifdef __FreeBSD__ --extern long long atoll(char *s); -+extern long long atoll(const char *s); - #endif /* __FreeBSD__ */ - - /// new implementation diff --git a/net/xmule/files/patch-src::otherfunctions.cpp b/net/xmule/files/patch-src::otherfunctions.cpp deleted file mode 100644 index ce9744278b99..000000000000 --- a/net/xmule/files/patch-src::otherfunctions.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/otherfunctions.cpp.orig Mon Apr 5 19:58:46 2004 -+++ src/otherfunctions.cpp Mon Apr 5 19:59:45 2004 -@@ -662,7 +662,7 @@ - } - - #ifdef __FreeBSD__ --long long atoll(char * s) { -+long long atoll(const char * s) { - return strtoll(s, (char **) NULL, 10); - } - |