On Tue, 27 Oct 2009, Giovanni Bechis wrote:
> Updated (and fixed) diff, comments ? Ok ?
> Cheers
> Giovanni
Hi,
works ok for me, although I've used it only on
i386 and only for mldonkey with the new gtk2 gui.
Apropos, what do you think about switching
mldonkey port from gtk1 to gtk2?
The following is a diff that does this and also
updates mldonkey to the latest 3.0.1.
Please test/comment/commit if you want...
cheers
-david
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/mldonkey/stable/Makefile,v
retrieving revision 1.26
diff -N -u -p Makefile
--- Makefile 10 Aug 2009 06:33:43 -0000 1.26
+++ Makefile 27 Oct 2009 11:49:51 -0000
@@ -1,44 +1,47 @@
# $OpenBSD: Makefile,v 1.26 2009/08/10 06:33:43 kili Exp $
-COMMENT= e-donkey client
-CATEGORIES= net
+COMMENT = e-donkey client
+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
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+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
+HOMEPAGE = http://mldonkey.sourceforge.net/Main_Page
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mldonkey/}
-DISTNAME= mldonkey-2.9.1
-PKGNAME= ${DISTNAME}p4
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mldonkey/}
+DISTNAME = mldonkey-3.0.1
+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'
+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'
-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
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/mldonkey/stable/distinfo,v
retrieving revision 1.13
diff -N -u -p distinfo
--- distinfo 17 Sep 2007 20:51:22 -0000 1.13
+++ distinfo 27 Oct 2009 11:49:51 -0000
@@ -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
Index: patches/patch-config_Makefile_in
===================================================================
RCS file: /cvs/ports/net/mldonkey/stable/patches/patch-config_Makefile_in,v
retrieving revision 1.10
diff -N -u -p patches/patch-config_Makefile_in
--- patches/patch-config_Makefile_in 17 Sep 2007 20:51:22 -0000 1.10
+++ patches/patch-config_Makefile_in 27 Oct 2009 11:49:51 -0000
@@ -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$
+--- 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 2
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
Index: patches/patch-config_configure_in
===================================================================
RCS file: /cvs/ports/net/mldonkey/stable/patches/patch-config_configure_in,v
retrieving revision 1.10
diff -N -u -p patches/patch-config_configure_in
--- patches/patch-config_configure_in 20 Jun 2009 22:05:11 -0000 1.10
+++ patches/patch-config_configure_in 27 Oct 2009 11:49:51 -0000
@@ -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$
+--- 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
# 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)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/mldonkey/stable/pkg/PLIST,v
retrieving revision 1.9
diff -N -u -p pkg/PLIST
--- pkg/PLIST 29 Jul 2007 22:13:15 -0000 1.9
+++ pkg/PLIST 27 Oct 2009 11:49:51 -0000
@@ -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
