ports/103410: [PATCH] net-p2p/mldonkey-devel: update to 2.8.1 and fix gd support

[Marcin Wisnicki]

>Number:         103410
>Category:       ports
>Synopsis:       [PATCH] net-p2p/mldonkey-devel: update to 2.8.1 and fix gd support
>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:   Tue Sep 19 19:20:24 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Marcin Wisnicki
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD ghost.pnet.one.pl 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #2: Sat Sep 16 14:36:40 CEST 2006
>Description:
- Update to 2.8.1
- fix GD support (it's a feature of core, not gui) and enable by default
- disable compilation of unnecessery core features when building only gui

Port maintainer (lioux at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- mldonkey-devel-2.8.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-p2p/mldonkey-devel.orig/Makefile /usr/ports/net-p2p/mldonkey-devel/Makefile
--- /usr/ports/net-p2p/mldonkey-devel.orig/Makefile	Mon Jun 26 03:11:40 2006
+++ /usr/ports/net-p2p/mldonkey-devel/Makefile	Tue Sep 19 20:47:14 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.7.7
-PORTREVISION=	1
+PORTVERSION=	2.8.1
 CATEGORIES+=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
 		${MASTER_SITE_SAVANNAH}
@@ -55,22 +54,19 @@
 IGNORE=	cannot install: you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing
 .endif
 # have no 'without-' flag
-CONFIGURE_ARGS+=--disable-gui \
-		--disable-gd
+CONFIGURE_ARGS+=--disable-gui
 PLIST_SUB+=	CORE="" GUI="@comment " GUICORE="@comment "
-CONFLICTS+=	mldonkey-core-[0.9]* mldonkey-core-stable-[0.9]* \
+CONFLICTS+=	mldonkey-core-[0-9]* mldonkey-core-stable-[0-9]* \
 		mldonkey-devel-[0-9]*
 PKGNAMESUFFIX=	-core-devel
 .else
 PLIST_SUB+=	GUI=""
-CONFLICTS+=	mldonkey-gui-[0.9]*
+CONFLICTS+=	mldonkey-gui-[0-9]*
 .if !defined(WITHOUT_CORE)
 CONFLICTS+=	mldonkey-devel-[0-9]*
 .endif
-BUILD_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
-		${LOCALBASE}/lib/ocaml/jabbr.cma:${PORTSDIR}/net-im/ocaml-jabbr
-LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd \
-		rsvg-2.2:${PORTSDIR}/graphics/librsvg2
+BUILD_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+LIB_DEPENDS+=	rsvg-2.2:${PORTSDIR}/graphics/librsvg2
 
 CONFIGURE_ARGS+=--enable-gui=newgui2
 # we don't need lablgtk as RUN dependency, but we need gtk+glib
@@ -78,6 +74,7 @@
 
 MAKE_ENV+=	OCAMLRUNPARAM="l=256M"
 .if defined(WITHOUT_CORE)
+CONFIGURE_ARGS+=--enable-minimum --disable-donkey
 PKGNAMESUFFIX=	-gui-devel
 PLIST_SUB+=	CORE="@comment " GUICORE="@comment "
 .else
@@ -85,6 +82,12 @@
 .endif
 .endif
 
+.if defined(WITHOUT_GD)
+CONFIGURE_ARGS+=--disable-gd
+.elif !defined(WITHOUT_CORE)
+LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
+.endif
+
 DOCFILES=	Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \
 		Install.txt Readme.txt Todo.txt ed2k_links.txt
 PORTDOCS=	${DOCFILES}
@@ -171,9 +174,7 @@
 	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey	${EXAMPLESDIR}
 .endif
 .ifndef(WITHOUT_GUI)
-	@${INSTALL_PROGRAM} ${WRKSRC}/mlchat		${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/mlgui		${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/mlim		${PREFIX}/bin
 .endif
 .ifndef(WITHOUT_CORE && WITHOUT_GUI)
 	@${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${PREFIX}/bin
diff -ruN --exclude=CVS /usr/ports/net-p2p/mldonkey-devel.orig/distinfo /usr/ports/net-p2p/mldonkey-devel/distinfo
--- /usr/ports/net-p2p/mldonkey-devel.orig/distinfo	Thu Jun 22 03:12:19 2006
+++ /usr/ports/net-p2p/mldonkey-devel/distinfo	Mon Sep 18 21:14:38 2006
@@ -1,3 +1,3 @@
-MD5 (mldonkey-2.7.7.tar.bz2) = d7b92ae3e8782a3c4adeb0e7870c07dc
-SHA256 (mldonkey-2.7.7.tar.bz2) = 8759345bf699b3b349d6db944b36c4f60a5cedf7e314eabf6b3817b8f1052958
-SIZE (mldonkey-2.7.7.tar.bz2) = 2847137
+MD5 (mldonkey-2.8.1.tar.bz2) = 10452ad305f105d0d0761977f825694d
+SHA256 (mldonkey-2.8.1.tar.bz2) = 6ac802a918bb71c47e06193936b07d4ea161dc68d35853793986d0b6b51fa3c4
+SIZE (mldonkey-2.8.1.tar.bz2) = 2642676
diff -ruN --exclude=CVS /usr/ports/net-p2p/mldonkey-devel.orig/pkg-plist /usr/ports/net-p2p/mldonkey-devel/pkg-plist
--- /usr/ports/net-p2p/mldonkey-devel.orig/pkg-plist	Sat Mar 18 02:13:42 2006
+++ /usr/ports/net-p2p/mldonkey-devel/pkg-plist	Tue Sep 19 20:14:33 2006
@@ -5,7 +5,5 @@
 %%GUICORE%%bin/mlguistarter
 %%GUICORE%%bin/mldonkey_previewer
 %%GUICORE%%bin/mlnet+gui
-%%GUI%%bin/mlchat
 %%GUI%%bin/mlgui
-%%GUI%%bin/mlim
 %%CORE%%@dirrm %%EXAMPLESDIR%%
--- mldonkey-devel-2.8.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: