Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Nov 2010 05:15:29 +0300
From:      Anonymous <swell.k@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/152434: [patch] net-p2p/amule-devel: update to r10386
Message-ID:  <86vd3re81q.fsf@gmail.com>
Resent-Message-ID: <201011210220.oAL2K7Em065730@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         152434
>Category:       ports
>Synopsis:       [patch] net-p2p/amule-devel: update to r10386
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 21 02:20:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: net-p2p/amule-devel/Makefile
===================================================================
RCS file: /a/.cvsup/ports/net-p2p/amule-devel/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- net-p2p/amule-devel/Makefile	24 Oct 2010 21:53:10 -0000	1.46
+++ net-p2p/amule-devel/Makefile	21 Nov 2010 01:30:27 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amule
-PORTVERSION=	10310
+PORTVERSION=	10386
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://amule.sourceforge.net/tarballs/
 PKGNAMESUFFIX=	-devel
@@ -42,7 +42,7 @@ OPTIONS=	ALC "Compile aMule Link Creator
 		ALCC "Compile aMule Link Creator for console" on \
 		AMULECMD "Compile aMule command line client" on \
 		AMULEDAEMON "Compile aMule daemon version" on \
-		AMULEGUI "Compile aMule remote GUI (EXPERIMENTAL)" on \
+		AMULEGUI "Compile aMule remote GUI" on \
 		CAS "Compile aMule Statistics for console" on \
 		ED2K "Compile aMule ed2k links handler" on \
 		FILEVIEW "Compile file viewer for console (EXPERIMENTAL)" on \
@@ -166,7 +166,9 @@ PLIST_SUB+=		MONOLITHIC="@comment "
 .endif
 
 .if !defined(WITHOUT_PLASMAMULE)
-CONFIGURE_ENV+=		ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config
+CONFIGURE_ENV+=		ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
+			KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \
+			UPDATE_MIME_DATABASE=${DO_NADA}
 CONFIGURE_ARGS+=	--enable-plasmamule
 USE_KDE4+=		kdelibs
 QT_COMPONENTS+=		dbus gui moc_build
@@ -216,6 +218,7 @@ PLIST_SUB+=		XAS="@comment "
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/LDFLAGS/s/-lpthread/${PTHREAD_LIBS}/' \
 		-e 's/test.*-print-file-name.*`/true/' \
+		-e '/if.*test/s/==/=/' \
 		${WRKSRC}/configure
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
@@ -225,7 +228,6 @@ post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \
 		-e 's|LDFLAGS =|& -L${KDE4_PREFIX}/lib |' \
 		-e '/plasma.*feeder.*LDFLAGS/s/=/& -lQtDBus /' \
-		-e 's/\(plasmamule_so_\)LDFLAGS/\1CXXFLAGS/' \
 		${WRKSRC}/src/utils/plasmamule/Makefile.in
 .endif
 
Index: net-p2p/amule-devel/Makefile.man
===================================================================
RCS file: /a/.cvsup/ports/net-p2p/amule-devel/Makefile.man,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.man
--- net-p2p/amule-devel/Makefile.man	19 Oct 2010 05:28:07 -0000	1.8
+++ net-p2p/amule-devel/Makefile.man	21 Nov 2010 01:48:09 -0000
@@ -11,6 +11,7 @@ MAN1_EN+=	alc.1
 MAN1_DE+=	alc.1
 MAN1_ES+=	alc.1
 MAN1_EU+=	alc.1
+MAN1_FR+=	alc.1
 MAN1_HU+=	alc.1
 MAN1_IT+=	alc.1
 . endif
@@ -55,6 +56,7 @@ MAN1_EN+=	wxcas.1
 MAN1_DE+=	wxcas.1
 MAN1_ES+=	wxcas.1
 MAN1_EU+=	wxcas.1
+MAN1_FR+=	wxcas.1
 MAN1_HU+=	wxcas.1
 MAN1_IT+=	wxcas.1
 . endif
Index: net-p2p/amule-devel/distinfo
===================================================================
RCS file: /a/.cvsup/ports/net-p2p/amule-devel/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- net-p2p/amule-devel/distinfo	19 Oct 2010 05:36:35 -0000	1.18
+++ net-p2p/amule-devel/distinfo	21 Nov 2010 01:30:57 -0000
@@ -1,3 +1,2 @@
-MD5 (aMule-SVN-r10310.tar.bz2) = ecd16ddc14e9604de50c5d1a85c4332c
-SHA256 (aMule-SVN-r10310.tar.bz2) = a7f73acf25983a185b5111e8badf70f62aee869b05c8a2abe9ea295a70d9e86f
-SIZE (aMule-SVN-r10310.tar.bz2) = 4507757
+SHA256 (aMule-SVN-r10386.tar.bz2) = 0ae1d2388cd6a8b948e276a054a9bca7d0623d4d881ec2f02475d8561d58ab6b
+SIZE (aMule-SVN-r10386.tar.bz2) = 4539581
Index: net-p2p/amule-devel/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/net-p2p/amule-devel/pkg-plist,v
retrieving revision 1.17
diff -u -p -r1.17 pkg-plist
--- net-p2p/amule-devel/pkg-plist	19 Oct 2010 05:28:07 -0000	1.17
+++ net-p2p/amule-devel/pkg-plist	29 Oct 2010 20:03:43 -0000
@@ -11,8 +11,8 @@
 %%PLASMAMULE%%share/mime/amule.xml
 %%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
 %%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
-%%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true
-%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true
+%%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
+%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
 %%PLASMAMULE%%@cwd
 %%ALC%%bin/alc
 %%ALCC%%bin/alcc
--- 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?86vd3re81q.fsf>