Update to 3.0.1 from new maintainer David Coppa

Switch to new gtk+2 gui
2009-10-29 08:28:09 +00:00 · 2009-10-29 08:28:09 +00:00 · d74d595834
commit d74d595834
parent 3d1eda003f
5 changed files with 57 additions and 65 deletions
--- a/net/mldonkey/stable/Makefile
+++ b/net/mldonkey/stable/Makefile
@ -1,44 +1,49 @@
-# $OpenBSD: Makefile,v 1.26 2009/08/10 06:33:43 kili Exp $
+# $OpenBSD: Makefile,v 1.27 2009/10/29 08:28:09 giovanni Exp $

-COMMENT=	e-donkey client
-CATEGORIES=	net
+COMMENT =	e-donkey client
+DISTNAME =	mldonkey-3.0.1
+CATEGORIES =	net

-# GPL
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-WANTLIB=		X11 Xext Xi c glib gmodule iconv intl m z pthread \
-			freetype png jpeg charset stdc++ fontconfig \
-			pthread-stubs xcb
-CONFIGURE_STYLE=	autoconf no-autoheader
-AUTOCONF_DIR=		${WRKSRC}/config
-AUTOCONF_VERSION=	2.61
-#CONFIGURE_ARGS+=	--enable-ocamlver=3.07
+HOMEPAGE =	http://mldonkey.sourceforge.net/Main_Page
+MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=mldonkey/}
+
+MAINTAINER =	David Coppa <dcoppa@gmail.com>
+
+# GPLv2
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_DISTFILES_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+
+EXTRACT_SUFX =		.tar.bz2
+WANTLIB += 		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+			Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
+			charset expat fontconfig freetype gdk-x11-2.0 \
+			gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 \
+			gobject-2.0 gtk-x11-2.0 iconv intl jpeg m pango-1.0 \
+			pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread \
+			stdc++ pthread-stubs xcb z
+CONFIGURE_STYLE =	autoconf no-autoheader
+AUTOCONF_DIR =		${WRKSRC}/config
+AUTOCONF_VERSION =	2.61
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config

-HOMEPAGE=	http://mldonkey.sourceforge.net/Main_Page
+CONFIGURE_ARGS +=	--enable-gui=newgui2
+CONFIGURE_ENV +=	CPPFLAGS='-I${LOCALBASE}/include/libpng\
+			-I${LOCALBASE}/include -I${X11BASE}/include'
+CONFIGURE_ENV +=	LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'

-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mldonkey/}
-DISTNAME=	mldonkey-2.9.1
-PKGNAME=	${DISTNAME}p4
-EXTRACT_SUFX=	.tar.bz2
-
-CONFIGURE_ARGS+=--enable-gui=newgui1
-CONFIGURE_ENV+=	CPPFLAGS='-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include'
-CONFIGURE_ENV+=	LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
-
-USE_X11=	Yes
-USE_GMAKE=	Yes
-MODULES=	lang/ocaml
-BUILD_DEPENDS=	::x11/lablgtk
-LIB_DEPENDS=	gdk.>=1,gtk.>=1::x11/gtk+ \
+USE_X11 =	Yes
+USE_GMAKE =	Yes
+MODULES =	lang/ocaml
+BUILD_DEPENDS =	::x11/lablgtk2
+LIB_DEPENDS =	rsvg-2::x11/gnome/librsvg \
 		bz2::archivers/bzip2 \
 		gd::graphics/gd \
 		magic::devel/libmagic

-FAKE_FLAGS=	MODOCAML_NATIVE=${MODOCAML_NATIVE}
-NO_REGRESS=	Yes
+FAKE_FLAGS =	MODOCAML_NATIVE=${MODOCAML_NATIVE}
+NO_REGRESS =	Yes

 post-install:
 	mkdir -p ${PREFIX}/share/mldonkey
--- a/net/mldonkey/stable/distinfo
+++ b/net/mldonkey/stable/distinfo
@ -1,5 +1,5 @@
-MD5 (mldonkey-2.9.1.tar.bz2) = D4iCvQvzQ7BWXiHlmyUrFg==
-RMD160 (mldonkey-2.9.1.tar.bz2) = wPMHdSyae+k+b70eNvXMPHNrmFY=
-SHA1 (mldonkey-2.9.1.tar.bz2) = 9OhxC2g2hBBzncNzgU2lhbKTxf8=
-SHA256 (mldonkey-2.9.1.tar.bz2) = LUlzKCXoZ9Swl5fTBXRMJXOgORvsZ8XUbFEe+brPPlw=
-SIZE (mldonkey-2.9.1.tar.bz2) = 2714291
+MD5 (mldonkey-3.0.1.tar.bz2) = sMO+VvIzWy6KF0nA4Q+inA==
+RMD160 (mldonkey-3.0.1.tar.bz2) = 0WqHIAv7KpMLRa+4Yne08DyNqd4=
+SHA1 (mldonkey-3.0.1.tar.bz2) = 9TgkW+Beb8Zn3VlsETb9D2TYRbg=
+SHA256 (mldonkey-3.0.1.tar.bz2) = un1AScZTqi+EbFbvU3ZRoFcR//X5DKqLu1HO5vIo8yc=
+SIZE (mldonkey-3.0.1.tar.bz2) = 2722659
--- a/net/mldonkey/stable/patches/patch-config_Makefile_in
+++ b/net/mldonkey/stable/patches/patch-config_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-config_Makefile_in,v 1.10 2007/09/17 20:51:22 rui Exp $
--- config/Makefile.in.orig	Fri Jun  1 20:31:08 2007
-+++ config/Makefile.in	Fri Sep 14 17:47:31 2007
-@@ -749,6 +749,8 @@ uninstall::
+$OpenBSD: patch-config_Makefile_in,v 1.11 2009/10/29 08:28:10 giovanni Exp $
+--- config/Makefile.in.orig	Tue Oct 27 05:34:03 2009
+++ config/Makefile.in	Tue Oct 27 05:39:03 2009
+@@ -586,6 +586,8 @@ uninstall::
 	rm -f $(BINDIR)/mlnet
 	rm -f $(BINDIR)/mlgui
 
@ -10,7 +10,7 @@ $OpenBSD: patch-config_Makefile_in,v 1.10 2007/09/17 20:51:22 rui Exp $
 install:: opt 
 	mkdir -p $(DESTDIR)$(prefix)/bin
 	if test -f mlnet; then \
-@@ -768,6 +770,21 @@ install:: opt 
+@@ -605,6 +607,21 @@ install:: opt 
              done; \
          fi
 
--- a/net/mldonkey/stable/patches/patch-config_configure_in
+++ b/net/mldonkey/stable/patches/patch-config_configure_in
@ -1,20 +1,7 @@
-$OpenBSD: patch-config_configure_in,v 1.10 2009/06/20 22:05:11 avsm Exp $
--- config/configure.in.orig	Sun Sep  9 16:15:08 2007
-+++ config/configure.in	Thu Nov 27 11:24:05 2008
-@@ -279,9 +279,9 @@ if test ! -z "$SUB_VERSION3"; then
-   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
- fi
- 
-REQUIRED_OCAML=3.10.0
-DOWNLOAD_OCAML_MAJOR=3.10
-DOWNLOAD_OCAML=3.10.0
-+REQUIRED_OCAML=3.11.1
-+DOWNLOAD_OCAML_MAJOR=3.11
-+DOWNLOAD_OCAML=3.11.1
- 
- REQUIRED_LABLGTK=1.2.7
- 
-@@ -850,7 +850,7 @@ if test "$GD" != "no"; then
+$OpenBSD: patch-config_configure_in,v 1.11 2009/10/29 08:28:10 giovanni Exp $
+--- config/configure.in.orig	Tue Oct 27 05:39:25 2009
+++ config/configure.in	Tue Oct 27 05:41:56 2009
+@@ -845,7 +845,7 @@ if test "$GD" != "no"; then
       PNG_LDFLAGS=`$PNGLIBCONFIG --ldflags`
       LDFLAGS="$LDFLAGS $PNG_LDFLAGS"
     fi
@ -23,7 +10,7 @@ $OpenBSD: patch-config_configure_in,v 1.10 2009/06/20 22:05:11 avsm Exp $
 # restore variables
     LIBS=$SAVE_LIBS_PNG
     CFLAGS=$SAVE_CFLAGS_PNG
-@@ -878,7 +878,7 @@ if test "$GD" != "no"; then
+@@ -873,7 +873,7 @@ if test "$GD" != "no"; then
         GD=yes
 	GD_PNG=yes
         AC_MSG_RESULT(yes)
--- a/net/mldonkey/stable/pkg/PLIST
+++ b/net/mldonkey/stable/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2007/07/29 22:13:15 rui Exp $
+@comment $OpenBSD: PLIST,v 1.10 2009/10/29 08:28:10 giovanni Exp $
 bin/mlbt
 bin/mlbt+gui
 bin/mldc
@ -8,9 +8,9 @@ bin/mldonkey+gui
 bin/mldonkey_gui
 bin/mlgnut
 bin/mlgnut+gui
-bin/mlgui
-bin/mlnet
-bin/mlnet+gui
+@bin bin/mlgui
+@bin bin/mlnet
+@bin bin/mlnet+gui
 bin/mlslsk
 bin/mlslsk+gui
 share/mldonkey/
@ -25,7 +25,7 @@ share/mldonkey/distrib/Install.txt
 share/mldonkey/distrib/Todo.txt
 share/mldonkey/distrib/ed2k_links.txt
 share/mldonkey/distrib/ed2k_mozilla/
-share/mldonkey/distrib/ed2k_mozilla/mldonkey_protocol_handler-2.1.xpi
+share/mldonkey/distrib/ed2k_mozilla/mldonkey_protocol_handler-2.5.xpi
 share/mldonkey/distrib/ed2k_submit/
 share/mldonkey/distrib/ed2k_submit/README.MLdonkeySubmit
 share/mldonkey/distrib/ed2k_submit/ed2k.protocol