1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

o Update to 1.6.1 [1] [3]

o Update to new wxgtk2 port [2]

PR:		58089 [1],
		58956 [2]
Submitted by:	Morten Rodal <morten@rodal.no> [1],
		Pav Lucistnik <pav@oook.cz> [2],
		Jerome Mainka <mainka@antidot.net> [3]
This commit is contained in:
Mario Sergio Fujikawa Ferreira 2003-11-10 02:49:18 +00:00
parent 1e4745f754
commit 7b89baf463
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=93616
8 changed files with 20 additions and 82 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= xmule
PORTVERSION= 1.6.0
PORTREVISION= 1
PORTVERSION= 1.6.1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xmule
@ -20,13 +19,14 @@ COMMENT= Port of eMule eDonkey P2P client using wxWindows class library
LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
expat.4:${PORTSDIR}/textproc/expat2 \
wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk
wx_gtk2-2.4:${PORTSDIR}/x11-toolkits/wxgtk2
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehier \
gnomehack \
gtk20 \
gnomeprefix
USE_REINPLACE= yes
USE_GMAKE= yes
@ -37,7 +37,9 @@ 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/wxgtk2-2.4-config
wx_gtk2-2.4:${PORTSDIR}/x11-toolkits/wxgtk2
post-patch:
# it works for FreeBSD as well
@ -74,19 +76,4 @@ post-install:
@${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>

View File

@ -1 +1 @@
MD5 (xmule-1.6.0.tar.bz2) = 513aee4826007d2e9c5bade5ca48b144
MD5 (xmule-1.6.1.tar.bz2) = 7db64383f0b2ed33f09f1cb5e34dd161

View File

@ -1,20 +0,0 @@
--- src/xmule.cpp.orig Tue Sep 9 00:15:19 2003
+++ src/xmule.cpp Tue Sep 9 00:16:06 2003
@@ -797,7 +797,7 @@
delete[] emulesig_path;
delete[] xmulesig_path;
} //End Added By Bouc7
-#if defined(__Linux__)
+#if 0
#include <execinfo.h>
#endif
@@ -810,7 +810,7 @@
theApp.clientudp->Destroy();
// (stkn) create backtrace
-#if defined(__Linux__)
+#if 0
void *bt_array[100]; // 100 should be enough ?!?
char **bt_strings;
int num_entries;

View File

@ -15,6 +15,8 @@ share/locale/tr/LC_MESSAGES/xmule.mo
@unexec rmdir %D/share/locale/tr 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/ko 2>/dev/null || true
@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/it 2>/dev/null || true
@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true

View File

@ -6,8 +6,7 @@
#
PORTNAME= xmule
PORTVERSION= 1.6.0
PORTREVISION= 1
PORTVERSION= 1.6.1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xmule
@ -20,13 +19,14 @@ COMMENT= Port of eMule eDonkey P2P client using wxWindows class library
LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
expat.4:${PORTSDIR}/textproc/expat2 \
wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk
wx_gtk2-2.4:${PORTSDIR}/x11-toolkits/wxgtk2
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehier \
gnomehack \
gtk20 \
gnomeprefix
USE_REINPLACE= yes
USE_GMAKE= yes
@ -37,7 +37,9 @@ 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/wxgtk2-2.4-config
wx_gtk2-2.4:${PORTSDIR}/x11-toolkits/wxgtk2
post-patch:
# it works for FreeBSD as well
@ -74,19 +76,4 @@ post-install:
@${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>

View File

@ -1 +1 @@
MD5 (xmule-1.6.0.tar.bz2) = 513aee4826007d2e9c5bade5ca48b144
MD5 (xmule-1.6.1.tar.bz2) = 7db64383f0b2ed33f09f1cb5e34dd161

View File

@ -1,20 +0,0 @@
--- src/xmule.cpp.orig Tue Sep 9 00:15:19 2003
+++ src/xmule.cpp Tue Sep 9 00:16:06 2003
@@ -797,7 +797,7 @@
delete[] emulesig_path;
delete[] xmulesig_path;
} //End Added By Bouc7
-#if defined(__Linux__)
+#if 0
#include <execinfo.h>
#endif
@@ -810,7 +810,7 @@
theApp.clientudp->Destroy();
// (stkn) create backtrace
-#if defined(__Linux__)
+#if 0
void *bt_array[100]; // 100 should be enough ?!?
char **bt_strings;
int num_entries;

View File

@ -15,6 +15,8 @@ share/locale/tr/LC_MESSAGES/xmule.mo
@unexec rmdir %D/share/locale/tr 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/ko 2>/dev/null || true
@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/it 2>/dev/null || true
@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true