Bug 149988 - [patch] net-p2p/amule2: update to 10273
Summary: [patch] net-p2p/amule2: update to 10273
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pav Lucistnik
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-08-26 14:50 UTC by swell.k
Modified: 2010-09-03 15:20 UTC (History)
0 users

See Also:


Attachments
a.diff (3.66 KB, patch)
2010-08-26 14:50 UTC, swell.k
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description swell.k 2010-08-26 14:50:02 UTC
- 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
Comment 1 swell.k 2010-08-30 05:45:46 UTC
Bump snapshot to r10274.

  ftp://ftp.lissyara.su/users/Guest/amule2.diff
Comment 2 Pav Lucistnik freebsd_committer freebsd_triage 2010-09-03 11:04:16 UTC
State Changed
From-To: open->feedback

New patch does not fetch. Old patch have checksum mismatch: 

> Attempting to fetch from http://repo.or.cz/w/amule.git/snapshot/. 
fetch: http://repo.or.cz/w/amule.git/snapshot/amule-svn-r10273.tar.gz: size unknown 
fetch: http://repo.or.cz/w/amule.git/snapshot/amule-svn-r10273.tar.gz: size of remote file is not known 
amule-svn-r10273.tar.gz                                 -1  B 1271 kBps 
=> MD5 Checksum mismatch for amule-svn-r10273.tar.gz. 
=> SHA256 Checksum mismatch for amule-svn-r10273.tar.gz. 



Comment 3 Pav Lucistnik freebsd_committer freebsd_triage 2010-09-03 11:04:16 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pav

New patch does not fetch. Old patch have checksum mismatch: 

> Attempting to fetch from http://repo.or.cz/w/amule.git/snapshot/. 
fetch: http://repo.or.cz/w/amule.git/snapshot/amule-svn-r10273.tar.gz: size unknown 
fetch: http://repo.or.cz/w/amule.git/snapshot/amule-svn-r10273.tar.gz: size of remote file is not known 
amule-svn-r10273.tar.gz                                 -1  B 1271 kBps 
=> MD5 Checksum mismatch for amule-svn-r10273.tar.gz. 
=> SHA256 Checksum mismatch for amule-svn-r10273.tar.gz.
Comment 4 swell.k 2010-09-03 12:29:40 UTC
Anonymous <swell.k@gmail.com> writes:

> Bump snapshot to r10274.
>
>   ftp://ftp.lissyara.su/users/Guest/amule2.diff

ftp.lissyara.su is currently down and will be for a while (around month).
Besides updating distfile there were no changes compared to the first diff.
The committer can just...

  1. grab and apply the first diff (a.diff)
  2. set PORTVERSION to 10275
  3. run `make makesum'
  4. put distfile somewhere, e.g. ports/local-distfiles
  5. commit

Tested revisions: 10273-10275.
Comment 5 swell.k 2010-09-03 14:23:33 UTC
pav@FreeBSD.org writes:

> Synopsis: [patch] net-p2p/amule2: update to 10273
>
> State-Changed-From-To: open->feedback
> State-Changed-By: pav
> State-Changed-When: Fri Sep 3 10:04:16 UTC 2010
> State-Changed-Why: 
> New patch does not fetch. Old patch have checksum mismatch:
>
>> Attempting to fetch from http://repo.or.cz/w/amule.git/snapshot/.
> fetch: http://repo.or.cz/w/amule.git/snapshot/amule-svn-r10273.tar.gz: size unknown
> fetch: http://repo.or.cz/w/amule.git/snapshot/amule-svn-r10273.tar.gz: size of remote file is not known
> amule-svn-r10273.tar.gz                                 -1  B 1271 kBps
> => MD5 Checksum mismatch for amule-svn-r10273.tar.gz.
> => SHA256 Checksum mismatch for amule-svn-r10273.tar.gz.

We can as well use upstream provided snapshot.

--- 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	3 Sep 2010 13:13:22 -0000
@@ -5,12 +5,11 @@
 # $FreeBSD: ports/net-p2p/amule2/Makefile,v 1.38 2010/08/13 13:18:23 pav Exp $
 #
 
-PORTNAME=	aMule
-PORTVERSION=	10266
+PORTNAME=	amule
+PORTVERSION=	10274
 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}
+MASTER_SITES=	http://amule.sourceforge.net/tarballs/
+DISTNAME=	aMule-SVN-r${PORTVERSION}
 
 MAINTAINER=	swell.k@gmail.com
 COMMENT=	The all-platform eMule p2p client
@@ -18,11 +17,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.*
-
-WRKSRC=		${WRKDIR}/${PORTNAME:L}
+LATEST_LINK=	amule2
+CONFLICTS=	aMule-[0-9]* aMule-devel-[0-9]* ed2k-hash-[0-9]*
 
+USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
 USE_GMAKE=	yes
 USE_KDE4=	# empty
@@ -30,16 +28,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 +53,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 +102,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 +149,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	3 Sep 2010 13:12:09 -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-r10274.tar.bz2) = 4016eb3a987de859266dc82b003e8b43
+SHA256 (aMule-SVN-r10274.tar.bz2) = afc6035479008fc39858b49b92d41aadfb866463b9aa2cefc13c56ee75357be1
+SIZE (aMule-SVN-r10274.tar.bz2) = 4504378
--- a.diff ends here ---
Comment 6 Pav Lucistnik freebsd_committer freebsd_triage 2010-09-03 15:09:36 UTC
State Changed
From-To: feedback->closed

Committed, thanks
Comment 7 dfilter service freebsd_committer freebsd_triage 2010-09-03 15:10:11 UTC
pav         2010-09-03 14:10:01 UTC

  FreeBSD ports repository

  Modified files:
    net-p2p/amule2       Makefile distinfo 
  Log:
  - Update to r10275
  
  PR:             ports/149988
  Submitted by:   Anonymous <swell.k@gmail.com> (maintainer)
  
  Revision  Changes    Path
  1.39      +13 -19    ports/net-p2p/amule2/Makefile
  1.15      +3 -3      ports/net-p2p/amule2/distinfo
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"