From 35b0480100b8a6cb9aa91fb61dfab9572b695252 Mon Sep 17 00:00:00 2001 From: espie Date: Wed, 7 Jun 2006 07:50:47 +0000 Subject: [PATCH] update to newer version so that it compiles with newer ocaml. (Hi Anil) (Hi Nikolay) --- net/mldonkey/stable/Makefile | 8 ++++--- net/mldonkey/stable/distinfo | 8 +++---- .../stable/patches/patch-config_Makefile_in | 10 ++++----- .../stable/patches/patch-config_configure_in | 22 +++++++++---------- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/net/mldonkey/stable/Makefile b/net/mldonkey/stable/Makefile index 28a0cd2eabc..5ae38f5685e 100644 --- a/net/mldonkey/stable/Makefile +++ b/net/mldonkey/stable/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2006/03/07 09:19:14 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2006/06/07 07:50:47 espie Exp $ COMMENT='e-donkey client' CATEGORIES=net @@ -21,7 +21,7 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config HOMEPAGE=http://mldonkey.sourceforge.net/Main_Page MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=mldonkey/} -DISTNAME=mldonkey-2.7.4 +DISTNAME=mldonkey-2.7.6 PKGNAME=${DISTNAME} EXTRACT_SUFX=.tar.bz2 @@ -34,7 +34,9 @@ MODULES=lang/ocaml BUILD_DEPENDS=::x11/lablgtk LIB_DEPENDS=gdk.1,gtk.1::x11/gtk+ \ bz2::archivers/bzip2 \ - gd::graphics/gd + gd::graphics/gd \ + magic::devel/libmagic + FAKE_FLAGS=MODOCAML_NATIVE=${MODOCAML_NATIVE} NO_REGRESS=Yes diff --git a/net/mldonkey/stable/distinfo b/net/mldonkey/stable/distinfo index 4204d34ab7d..686a309ef90 100644 --- a/net/mldonkey/stable/distinfo +++ b/net/mldonkey/stable/distinfo @@ -1,4 +1,4 @@ -MD5 (mldonkey-2.7.4.tar.bz2) = 94e9216086103114528b434fb61424d4 -RMD160 (mldonkey-2.7.4.tar.bz2) = 7945d140e823d819c88e743f34ce813b6ae09603 -SHA1 (mldonkey-2.7.4.tar.bz2) = 8d972e48f06e75b9d9773adfc1b51055c64d41fe -SIZE (mldonkey-2.7.4.tar.bz2) = 2810334 +MD5 (mldonkey-2.7.6.tar.bz2) = 08e3cccce6fe65f5437a309276fe2c68 +RMD160 (mldonkey-2.7.6.tar.bz2) = 8989e86e26b6b4ed4fc8f783093c6e187b6d5051 +SHA1 (mldonkey-2.7.6.tar.bz2) = 330c5b9c56f5fc09f2ca8a66090d96148253a2de +SIZE (mldonkey-2.7.6.tar.bz2) = 2835134 diff --git a/net/mldonkey/stable/patches/patch-config_Makefile_in b/net/mldonkey/stable/patches/patch-config_Makefile_in index 7481c291b0a..534596f8a63 100644 --- 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.4 2006/03/07 09:19:14 espie Exp $ ---- config/Makefile.in.orig Sat Feb 11 20:52:57 2006 -+++ config/Makefile.in Tue Mar 7 10:04:44 2006 -@@ -775,6 +775,8 @@ uninstall:: +$OpenBSD: patch-config_Makefile_in,v 1.5 2006/06/07 07:50:47 espie Exp $ +--- config/Makefile.in.orig Mon May 15 19:43:09 2006 ++++ config/Makefile.in Wed Jun 7 09:36:56 2006 +@@ -786,6 +786,8 @@ uninstall:: rm -f $(BINDIR)/mlnet rm -f $(BINDIR)/mlgui @@ -10,7 +10,7 @@ $OpenBSD: patch-config_Makefile_in,v 1.4 2006/03/07 09:19:14 espie Exp $ install:: opt mkdir -p $(DESTDIR)$(prefix)/bin if test -f mlnet; then \ -@@ -797,6 +799,22 @@ install:: opt +@@ -808,6 +810,22 @@ install:: opt rm -f $(DESTDIR)$(prefix)/bin/mlim; cp -f mlim $(DESTDIR)$(prefix)/bin/mlim; \ fi diff --git a/net/mldonkey/stable/patches/patch-config_configure_in b/net/mldonkey/stable/patches/patch-config_configure_in index 0dc415de237..7c6ffdfb33d 100644 --- a/net/mldonkey/stable/patches/patch-config_configure_in +++ b/net/mldonkey/stable/patches/patch-config_configure_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-config_configure_in,v 1.2 2006/03/07 09:19:14 espie Exp $ ---- config/configure.in.orig Sun Feb 26 16:50:54 2006 -+++ config/configure.in Tue Mar 7 09:00:59 2006 -@@ -1057,7 +1057,7 @@ if test "$GD" != "no"; then - if test "$LIBGD" = "yes"; then - - LIBPNG=no +$OpenBSD: patch-config_configure_in,v 1.3 2006/06/07 07:50:47 espie Exp $ +--- config/configure.in.orig Sun May 21 09:55:24 2006 ++++ config/configure.in Wed Jun 7 09:37:39 2006 +@@ -733,7 +733,7 @@ if test "$GD" != "no"; then + PNG_LDFLAGS=`$PNGLIBCONFIG --ldflags` + LDFLAGS="$LDFLAGS $PNG_LDFLAGS" + fi - AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes]) + AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes],, -lz -lm) - - if test "$LIBPNG" = "no"; then - AC_MSG_NOTICE(png support not available) -@@ -1081,7 +1081,7 @@ if test "$GD" != "no"; then + # restore variables + LIBS=$SAVE_LIBS_PNG + CFLAGS=$SAVE_CFLAGS_PNG +@@ -761,7 +761,7 @@ if test "$GD" != "no"; then GD=yes GD_PNG=yes AC_MSG_RESULT(yes)