Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Jan 2011 16:42:18 +0300
From:      Anonymous <swell.k@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/154238: [patch] net-p2p/amule-devel: update to r10436
Message-ID:  <86vd1f68jp.fsf@gmail.com>
Resent-Message-ID: <201101231350.p0NDo8vl075078@freefall.freebsd.org>

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

>Number:         154238
>Category:       ports
>Synopsis:       [patch] net-p2p/amule-devel: update to r10436
>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 Jan 23 13:50:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- update
- move some USE_* under bsd.port.options.mk
>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.49
diff -u -p -r1.49 Makefile
--- net-p2p/amule-devel/Makefile	2 Jan 2011 14:13:02 -0000	1.49
+++ net-p2p/amule-devel/Makefile	21 Jan 2011 05:06:49 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amule
-PORTVERSION=	10400
+PORTVERSION=	10436
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://amule.sourceforge.net/tarballs/
 PKGNAMESUFFIX=	-devel
@@ -27,8 +27,6 @@ LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYIN
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
 USE_GMAKE=	yes
-USE_KDE4=	# empty
-USE_QT_VER=	4
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
@@ -67,7 +65,7 @@ PORTDOCS=	ABOUT-NLS Changelog EC_Protoco
 FLEX?=		${LOCALBASE}/bin/flex
 PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--disable-debug
@@ -174,7 +172,8 @@ CONFIGURE_ENV+=		ac_cv_path_KDE4_CONFIG=
 			KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \
 			UPDATE_MIME_DATABASE=/usr/bin/true
 CONFIGURE_ARGS+=	--enable-plasmamule
-USE_KDE4+=		kdelibs
+USE_KDE4=		kdelibs
+USE_QT_VER=		4
 QT_COMPONENTS+=		dbus gui moc_build
 PLIST_SUB+=		PLASMAMULE=""
 .else
@@ -245,4 +244,4 @@ post-install:
 .endif
 	-update-desktop-database ${PREFIX}/share/applications
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-p2p/amule-devel/Makefile.man
===================================================================
RCS file: /a/.cvsup/ports/net-p2p/amule-devel/Makefile.man,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.man
--- net-p2p/amule-devel/Makefile.man	24 Nov 2010 02:08:42 -0000	1.9
+++ net-p2p/amule-devel/Makefile.man	23 Jan 2011 13:31:32 -0000
@@ -1,28 +1,17 @@
-# TODO : Add fr here when pages are complete
-MANLANG=	"" de es eu fr hu it
-#MANCOMPRESSED=	no
+# no eu for amulegui.1
+# no fr for amulegui.1, cas.1, xas.1
+# no ru for xas.1
+MANLANG=	"" de es eu fr hu it ru
 
 .if !defined(WITHOUT_NLS)
 . if !defined(WITHOUT_MONOLITHIC)
 MAN1+=		amule.1
 . endif
 . if !defined(WITHOUT_ALC)
-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
+MAN1+=		alc.1
 . endif
 . if !defined(WITHOUT_ALCC)
-MAN1_EN+=	alcc.1
-MAN1_DE+=	alcc.1
-MAN1_ES+=	alcc.1
-MAN1_EU+=	alcc.1
-MAN1_FR+=	alcc.1
-MAN1_HU+=	alcc.1
-MAN1_IT+=	alcc.1
+MAN1+=		alcc.1
 . endif
 . if !defined(WITHOUT_AMULECMD)
 MAN1+=		amulecmd.1
@@ -36,6 +25,7 @@ MAN1_DE+=	amulegui.1
 MAN1_ES+=	amulegui.1
 MAN1_HU+=	amulegui.1
 MAN1_IT+=	amulegui.1
+MAN1_RU+=	amulegui.1
 . endif
 . if !defined(WITHOUT_CAS)
 MAN1_EN+=	cas.1
@@ -44,6 +34,7 @@ MAN1_ES+=	cas.1
 MAN1_EU+=	cas.1
 MAN1_HU+=	cas.1
 MAN1_IT+=	cas.1
+MAN1_RU+=	cas.1
 . endif
 . if !defined(WITHOUT_ED2K)
 MAN1+=		ed2k.1
@@ -52,13 +43,7 @@ MAN1+=		ed2k.1
 MAN1+=		amuleweb.1
 . endif
 . if !defined(WITHOUT_WXCAS)
-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
+MAN1+=		wxcas.1
 . endif
 .endif # !WITHOUT_NLS
 
Index: net-p2p/amule-devel/distinfo
===================================================================
RCS file: /a/.cvsup/ports/net-p2p/amule-devel/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- net-p2p/amule-devel/distinfo	23 Dec 2010 03:59:36 -0000	1.20
+++ net-p2p/amule-devel/distinfo	21 Jan 2011 05:07:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (aMule-SVN-r10400.tar.bz2) = 8ded9e003b3001c5d16b1d72a6a63938a9b3a238ef090f2b0c29ed6ed1cf0ea7
-SIZE (aMule-SVN-r10400.tar.bz2) = 4538567
+SHA256 (aMule-SVN-r10436.tar.bz2) = b0f8c82050f0ea832732be7a65cdf891b0bbe8a2d18956ff1cedd59721011110
+SIZE (aMule-SVN-r10436.tar.bz2) = 4556592
Index: net-p2p/amule-devel/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/net-p2p/amule-devel/pkg-plist,v
retrieving revision 1.18
diff -u -p -r1.18 pkg-plist
--- net-p2p/amule-devel/pkg-plist	24 Nov 2010 02:08:42 -0000	1.18
+++ net-p2p/amule-devel/pkg-plist	23 Jan 2011 13:25:39 -0000
@@ -162,6 +162,8 @@
 @dirrmtry man/hu
 @dirrmtry man/it/man1
 @dirrmtry man/it
+@dirrmtry man/ru/man1
+@dirrmtry man/ru
 @dirrm %%DATADIR%%/skins
 %%WEBSERVER%%@dirrm %%DATADIR%%/webserver/default
 %%WEBSERVER%%@dirrm %%DATADIR%%/webserver
--- 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?86vd1f68jp.fsf>