Date: Thu, 26 Aug 2010 17:44:13 +0400 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/149988: [patch] net-p2p/amule2: update to 10273 Message-ID: <868w3to5ea.fsf@gmail.com> Resent-Message-ID: <201008261350.o7QDo3eF089193@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149988
>Category: ports
>Synopsis: [patch] net-p2p/amule2: update to 10273
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 26 13:50:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- update
- includes my diff in ports/149627[1]
[1] since it requires PORTREVISION bump in order to regen the package
why not update snapshot, too
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: net-p2p/amule2/Makefile
===================================================================
RCS file: /a/.cvsup/ports/net-p2p/amule2/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- net-p2p/amule2/Makefile 13 Aug 2010 13:18:23 -0000 1.38
+++ net-p2p/amule2/Makefile 26 Aug 2010 12:48:53 -0000
@@ -5,12 +5,12 @@
# $FreeBSD: ports/net-p2p/amule2/Makefile,v 1.38 2010/08/13 13:18:23 pav Exp $
#
-PORTNAME= aMule
-PORTVERSION= 10266
+PORTNAME= amule
+PORTVERSION= 10273
CATEGORIES= net-p2p
MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/ \
- http://repo.or.cz/w/${PORTNAME:L}.git/snapshot/
-DISTNAME= ${PORTNAME:L}-svn-r${PORTVERSION}
+ http://repo.or.cz/w/${PORTNAME}.git/snapshot/
+DISTNAME= ${PORTNAME}-svn-r${PORTVERSION}
MAINTAINER= swell.k@gmail.com
COMMENT= The all-platform eMule p2p client
@@ -18,10 +18,10 @@ COMMENT= The all-platform eMule p2p clie
BUILD_DEPENDS= ${FLEX}:${PORTSDIR}/textproc/flex \
${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
-LATEST_LINK= aMule2
-CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-1.*
+LATEST_LINK= amule2
+CONFLICTS= aMule-[0-9]* aMule-devel-[0-9]* ed2k-hash-[0-9]*
-WRKSRC= ${WRKDIR}/${PORTNAME:L}
+WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= pkgconfig
USE_GMAKE= yes
@@ -30,16 +30,16 @@ USE_QT_VER= 4
USE_WX= 2.8
WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-included-gettext \
- --with-libintl-prefix=${LOCALBASE} \
- --with-libiconv-prefix=${LOCALBASE} \
- --with-crypto-prefix=${LOCALBASE} \
- --with-denoise-level=0
+CONFIGURE_ARGS= --with-denoise-level=0
CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
docdir='$${prefix}/${DOCSDIR_REL}' \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+ CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
OPTIONS= ALC "Compile aMule Link Creator (+GUI)" on \
AMULECMD "Compile aMule command line client" on \
@@ -55,8 +55,6 @@ OPTIONS= ALC "Compile aMule Link Creator
WXUNICODE "Enable Unicode support" on \
XAS "Install XChat2 plugin" on
-DATADIR_REL= share/${PORTNAME:L}
-DOCSDIR_REL= share/doc/${PORTNAME:L}
PORTDOCS= ABOUT-NLS Changelog EC_Protocol.txt \
ED2K-Links.HOWTO INSTALL README TODO \
amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol
@@ -106,7 +104,6 @@ PLIST_SUB+= AMULEDAEMON="@comment "
.if !defined(WITHOUT_AMULEGUI)
CONFIGURE_ARGS+= --enable-amule-gui
PLIST_SUB+= AMULEGUI=""
-USE_RC_SUBR= amuled.sh
.else
CONFIGURE_ARGS+= --disable-amule-gui
PLIST_SUB+= AMULEGUI="@comment "
@@ -154,7 +151,6 @@ PLIST_SUB+= PLASMAMULE="@comment "
.endif
.if !defined(WITHOUT_UPNP)
-CONFIGURE_ARGS+= --with-libupnp-prefix=${LOCALBASE}
LIB_DEPENDS+= upnp.3:${PORTSDIR}/devel/upnp
.else
CONFIGURE_ARGS+= --disable-upnp
Index: net-p2p/amule2/distinfo
===================================================================
RCS file: /a/.cvsup/ports/net-p2p/amule2/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- net-p2p/amule2/distinfo 13 Aug 2010 13:18:23 -0000 1.14
+++ net-p2p/amule2/distinfo 26 Aug 2010 12:51:39 -0000
@@ -1,3 +1,3 @@
-MD5 (amule-svn-r10266.tar.gz) = 2a83be92ab349bbf9a61568feebf624d
-SHA256 (amule-svn-r10266.tar.gz) = ed55a47241a680a8606fee412792f1f3c765d585babd7fc0209d758dcbc81278
-SIZE (amule-svn-r10266.tar.gz) = 5952465
+MD5 (amule-svn-r10273.tar.gz) = 093638e07c8a2b4f8ecd48eda98cf8b7
+SHA256 (amule-svn-r10273.tar.gz) = 59340ecd89f9663b83788c8864438c52147fb64b5218762aae01d1e5ab73e86d
+SIZE (amule-svn-r10273.tar.gz) = 5950454
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?868w3to5ea.fsf>