update to newer version so that it compiles with newer ocaml.

(Hi Anil)
(Hi Nikolay)
This commit is contained in:
espie 2006-06-07 07:50:47 +00:00
parent abed38c40d
commit 35b0480100
4 changed files with 25 additions and 23 deletions

View File

@ -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' COMMENT='e-donkey client'
CATEGORIES=net CATEGORIES=net
@ -21,7 +21,7 @@ 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/} MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=mldonkey/}
DISTNAME=mldonkey-2.7.4 DISTNAME=mldonkey-2.7.6
PKGNAME=${DISTNAME} PKGNAME=${DISTNAME}
EXTRACT_SUFX=.tar.bz2 EXTRACT_SUFX=.tar.bz2
@ -34,7 +34,9 @@ MODULES=lang/ocaml
BUILD_DEPENDS=::x11/lablgtk BUILD_DEPENDS=::x11/lablgtk
LIB_DEPENDS=gdk.1,gtk.1::x11/gtk+ \ LIB_DEPENDS=gdk.1,gtk.1::x11/gtk+ \
bz2::archivers/bzip2 \ bz2::archivers/bzip2 \
gd::graphics/gd gd::graphics/gd \
magic::devel/libmagic
FAKE_FLAGS=MODOCAML_NATIVE=${MODOCAML_NATIVE} FAKE_FLAGS=MODOCAML_NATIVE=${MODOCAML_NATIVE}
NO_REGRESS=Yes NO_REGRESS=Yes

View File

@ -1,4 +1,4 @@
MD5 (mldonkey-2.7.4.tar.bz2) = 94e9216086103114528b434fb61424d4 MD5 (mldonkey-2.7.6.tar.bz2) = 08e3cccce6fe65f5437a309276fe2c68
RMD160 (mldonkey-2.7.4.tar.bz2) = 7945d140e823d819c88e743f34ce813b6ae09603 RMD160 (mldonkey-2.7.6.tar.bz2) = 8989e86e26b6b4ed4fc8f783093c6e187b6d5051
SHA1 (mldonkey-2.7.4.tar.bz2) = 8d972e48f06e75b9d9773adfc1b51055c64d41fe SHA1 (mldonkey-2.7.6.tar.bz2) = 330c5b9c56f5fc09f2ca8a66090d96148253a2de
SIZE (mldonkey-2.7.4.tar.bz2) = 2810334 SIZE (mldonkey-2.7.6.tar.bz2) = 2835134

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_Makefile_in,v 1.4 2006/03/07 09:19:14 espie Exp $ $OpenBSD: patch-config_Makefile_in,v 1.5 2006/06/07 07:50:47 espie Exp $
--- config/Makefile.in.orig Sat Feb 11 20:52:57 2006 --- config/Makefile.in.orig Mon May 15 19:43:09 2006
+++ config/Makefile.in Tue Mar 7 10:04:44 2006 +++ config/Makefile.in Wed Jun 7 09:36:56 2006
@@ -775,6 +775,8 @@ uninstall:: @@ -786,6 +786,8 @@ uninstall::
rm -f $(BINDIR)/mlnet rm -f $(BINDIR)/mlnet
rm -f $(BINDIR)/mlgui 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 install:: opt
mkdir -p $(DESTDIR)$(prefix)/bin mkdir -p $(DESTDIR)$(prefix)/bin
if test -f mlnet; then \ 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; \ rm -f $(DESTDIR)$(prefix)/bin/mlim; cp -f mlim $(DESTDIR)$(prefix)/bin/mlim; \
fi fi

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-config_configure_in,v 1.2 2006/03/07 09:19:14 espie Exp $ $OpenBSD: patch-config_configure_in,v 1.3 2006/06/07 07:50:47 espie Exp $
--- config/configure.in.orig Sun Feb 26 16:50:54 2006 --- config/configure.in.orig Sun May 21 09:55:24 2006
+++ config/configure.in Tue Mar 7 09:00:59 2006 +++ config/configure.in Wed Jun 7 09:37:39 2006
@@ -1057,7 +1057,7 @@ if test "$GD" != "no"; then @@ -733,7 +733,7 @@ if test "$GD" != "no"; then
if test "$LIBGD" = "yes"; then PNG_LDFLAGS=`$PNGLIBCONFIG --ldflags`
LDFLAGS="$LDFLAGS $PNG_LDFLAGS"
LIBPNG=no fi
- AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes]) - AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes])
+ AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes],, -lz -lm) + AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes],, -lz -lm)
# restore variables
if test "$LIBPNG" = "no"; then LIBS=$SAVE_LIBS_PNG
AC_MSG_NOTICE(png support not available) CFLAGS=$SAVE_CFLAGS_PNG
@@ -1081,7 +1081,7 @@ if test "$GD" != "no"; then @@ -761,7 +761,7 @@ if test "$GD" != "no"; then
GD=yes GD=yes
GD_PNG=yes GD_PNG=yes
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)