Updated to version 3.1.3. Fixed -gui build to work with x11/lablgtk 2.16.

5 files changed, 92 insertions, 11 deletions

diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index aba6bb41af6..c424c451e28 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,22 +1,24 @@
-# $NetBSD: Makefile,v 1.55 2012/09/07 19:17:21 adam Exp $
+# $NetBSD: Makefile,v 1.56 2012/09/14 19:23:31 jaapb Exp $
 #
 
 .include "../../net/mldonkey/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/mldonkey/mldonkey-gui/}
-PKGREVISION=		4
 
 COMMENT+=		(GTK interface)
 
 DEPENDS+=		mldonkey-[0-9]*:../../net/mldonkey
 
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		pkg-config autoconf
 
 INSTALLATION_DIRS=	bin libexec/mldonkey
 
 CONFIGURE_ARGS+=	--enable-gui=newgui2
 CONFIGURE_ARGS+=	--disable-option-checking
 
+pre-configure:
+	cd ${WRKSRC}/config && autoconf
+
 do-install:
 	${RM} -f ${DESTDIR}${PREFIX}/bin/mlgui
 	cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../libexec/mldonkey/mlgui mlgui
@@ -28,7 +30,7 @@ do-install:
 
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-# 2.6.0 is the first ~stable version (for mldonkey)
-BUILDLINK_API_DEPENDS.lablgtk+=	lablgtk>=2.6.0
+# 2.16.0 is the first version that installs in the right location
+BUILDLINK_API_DEPENDS.lablgtk+=	lablgtk>=2.16.0
 .include "../../x11/lablgtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index 6c2684776ec..d2b587c2be9 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.44 2012/06/18 15:17:12 wiz Exp $
+# $NetBSD: Makefile.common,v 1.45 2012/09/14 19:23:30 jaapb Exp $
 #
 # used by net/mldonkey/Makefile
 # used by net/mldonkey-gui/Makefile
 
-DISTNAME=	mldonkey-3.1.2
+DISTNAME=	mldonkey-3.1.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mldonkey/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index 728a444c615..9994e5010d6 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.57 2012/05/29 14:02:00 wiz Exp $
+$NetBSD: distinfo,v 1.58 2012/09/14 19:23:30 jaapb Exp $
 
-SHA1 (mldonkey-3.1.2.tar.bz2) = be8c261e2fbd365dd3866af15a854b074fbc59c1
-RMD160 (mldonkey-3.1.2.tar.bz2) = 5039f7a25ad575e2bb6bea616fa13e01268b596b
-Size (mldonkey-3.1.2.tar.bz2) = 2844260 bytes
+SHA1 (mldonkey-3.1.3.tar.bz2) = 424386f277e84df55a2cbab213fae60787e42c8b
+RMD160 (mldonkey-3.1.3.tar.bz2) = 2b640fbd9ac85918bf3ba0a51f86fabb6d862890
+Size (mldonkey-3.1.3.tar.bz2) = 2848964 bytes
+SHA1 (patch-config_Makefile.in) = a575c505c1f736bc3940790b43a6cf2083f29112
+SHA1 (patch-config_configure.in) = aaec2d1b5ca2520f6a9449a8680ad6456bb89dcc
diff --git a/net/mldonkey/patches/patch-config_Makefile.in b/net/mldonkey/patches/patch-config_Makefile.in
new file mode 100644
index 00000000000..048f35d8246
--- /dev/null
+++ b/net/mldonkey/patches/patch-config_Makefile.in
@@ -0,0 +1,44 @@
+$NetBSD: patch-config_Makefile.in,v 1.1 2012/09/14 19:23:31 jaapb Exp $
+
+Correct include paths for lablgtk 2.16
+--- config/Makefile.in.orig	2012-07-01 17:47:41.000000000 +0000
++++ config/Makefile.in
+@@ -655,15 +655,18 @@ install:: opt 
+ 
+ ifneq ("$(GUI)" , "no")
+   ifeq ("$(GUI)", "newgui2")
+-    SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2
+-    GTK_LIBS_byte=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma
+-    GTK_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
+-    GTK_STATIC_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
++    SL_DIR=$(OCAMLLIB)/site-lib
++    SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) $(SL_DIR)/lablgtk2
++    GTK_LIBS_byte=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I $(SL_DIR)/lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma
++    GTK_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I $(SL_DIR)/lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
++    GTK_STATIC_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I $(SL_DIR)/lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
++    LIBS_flags+=-ccopt "-I $(SL_DIR)"
+   else
+-    SUBDIRS += $(SRC_GUI) $(CONFIGWIN) $(OKEY) $(GPATTERN) $(ICONS_CHOICE) +lablgtk $(SRC_PROGRESS)
+-    GTK_LIBS_byte=-I +lablgtk $(LABLGL_CMA) lablgtk.cma
+-    GTK_LIBS_opt=-I +lablgtk  $(LABLGL_CMXA) lablgtk.cmxa
+-    GTK_STATIC_LIBS_opt=-I +lablgtk lablgtk.cmxa
++    SUBDIRS += $(SRC_GUI) $(CONFIGWIN) $(OKEY) $(GPATTERN) $(ICONS_CHOICE) $(SL_DIR)/lablgtk $(SRC_PROGRESS)
++    GTK_LIBS_byte=-I $(SL_DIR)/lablgtk $(LABLGL_CMA) lablgtk.cma
++    GTK_LIBS_opt=-I $(SL_DIR)/lablgtk  $(LABLGL_CMXA) lablgtk.cmxa
++    GTK_STATIC_LIBS_opt=-I $(SL_DIR)/lablgtk lablgtk.cmxa
++    LIBS_flags+=-ccopt "-I $(SL_DIR)"
+   endif
+ 
+ SVG_CONVERTER_SRCS = \
+@@ -1561,9 +1564,9 @@ resfile.o:
+ 
+ depend:   $(RESFILE) \
+ 	$(PA_ZOG) $(LIB)/http_lexer.ml $(TMPSOURCES)
+-	@$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +labl$(GTK),,$(INCLUDES)) *.ml *.mli > .depend
++	@$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I $(OCAMLLIB)/site-lib/labl$(GTK),,$(INCLUDES)) *.ml *.mli > .depend
+ 	@(for i in $(SUBDIRS); do \
+-		$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +labl$(GTK),,$(INCLUDES)) $$i/*.ml $$i/*.mli  >> .depend; \
++		$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I $(OCAMLLIB)/site-lib/labl$(GTK),,$(INCLUDES)) $$i/*.ml $$i/*.mli  >> .depend; \
+ 		$(OCAMLPP) $$i/*.mlt  >> .depend; \
+ 	done)
+ 	@if test "$(GUI)" = "newgui2"; then \
diff --git a/net/mldonkey/patches/patch-config_configure.in b/net/mldonkey/patches/patch-config_configure.in
new file mode 100644
index 00000000000..1d581797e08
--- /dev/null
+++ b/net/mldonkey/patches/patch-config_configure.in
@@ -0,0 +1,33 @@
+$NetBSD: patch-config_configure.in,v 1.1 2012/09/14 19:23:31 jaapb Exp $
+
+Correct include paths for lablgtk 2.16
+--- config/configure.in.orig	2012-08-05 15:49:02.000000000 +0000
++++ config/configure.in
+@@ -1347,15 +1347,15 @@ if test "$GTK_CONFIG" = "no"; then
+      LABLGTK_CONFIG=no
+ else
+   AC_MSG_CHECKING(for native code $LABLGTK_NAME)
+-  if test -f $OCAMLLIB/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
++  if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
+      if test "$GUI" = "newgui2"; then
+-       if test -f $OCAMLLIB/$LABLGTK_NAME/lablrsvg.$OCAMLLIB_EXT; then
++       if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablrsvg.$OCAMLLIB_EXT; then
+          AC_MSG_RESULT(yes)
+          LABLGTK_CONFIG=yes
+        else
+          AC_MSG_RESULT(no)
+          LABLGTK_CONFIG=no
+-         if test -f $OCAMLLIB/$LABLGTK_NAME/lablrsvg.cma; then
++         if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablrsvg.cma; then
+            echo "---------------------------------------------------------"
+            echo "lablrsvg is not installed properly. See the INSTALL.txt"
+            echo "file of mldonkey to see how to compile $LABLGTK_NAME. You"
+@@ -1376,7 +1376,7 @@ else
+   else
+      AC_MSG_RESULT(no)
+      LABLGTK_CONFIG=no
+-     if test -f $OCAMLLIB/$LABLGTK_NAME/lablgtk.cma; then
++     if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablgtk.cma; then
+        echo "-------------------------------------------------------------"
+        echo "$LABLGTK_NAME is not installed properly. See the INSTALL.txt"
+        echo "file of mldonkey to see how to compile $LABLGTK_NAME. You"