o Update to 2.8.4

o Simplify Makefile's port logic
o Do not install rc(8) script if only the graphical user interface
  is being installed [1]

PR:		104029 [1]
Submitted by:	Marcin Wisnicki <mwisnicki+freebsd@gmail.com> [1]

4 files changed, 61 insertions, 44 deletions

diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index bbbec00f39f1..dabc58904fc4 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.8.3
+PORTVERSION=	2.8.4
 CATEGORIES+=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
 		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMESUFFIX=	-devel
+PKGNAMESUFFIX?=	-devel
 
 MAINTAINER?=	lioux@FreeBSD.org
 COMMENT?=	A OCAML client for multiple peer-to-peer networks
@@ -19,15 +19,15 @@ COMMENT?=	A OCAML client for multiple peer-to-peer networks
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
 NO_LATEST_LINK=	yes
-CONFLICTS=	mldonkey-[0-9]*
+CONFLICTS=	mldonkey{-{core,gui},}-[0-9]*
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
-USE_RC_SUBR=	mlnet
 USE_AUTOTOOLS=	autoconf:259:env
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	opt
+MAKE_ENV+=	OCAMLRUNPARAM="l=256M"
 
 CONFIGURE_ARGS+=\
 		--enable-ocamlver=3 \
@@ -49,41 +49,53 @@ LIB_DEPENDS+=	bz2:${PORTSDIR}/archivers/bzip2
 ###
 ## Options activation
 ###
-.if defined(WITHOUT_GUI)
-.if defined(WITHOUT_CORE)
+.if defined(WITHOUT_GUI) && defined(WITHOUT_CORE)
 IGNORE=	cannot install: you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing
 .endif
-# have no 'without-' flag
+
+.if !(defined(WITHOUT_GUI) || defined(WITHOUT_CORE))
+CONFLICTS+=	mldonkey-core-devel-[0.9]*
+CONFLICTS+=	mldonkey-gui-devel-[0.9]*
+
+PLIST_SUB+=	CORE="" GUI="" GUICORE=""
+.else # (defined(WITHOUT_GUI) || defined(WITHOUT_CORE))
+
+. if defined(WITHOUT_GUI)
+PKGNAMESUFFIX=	-core-devel
+
+CONFLICTS+=	mldonkey-gui-devel-[0.9]*
+
 CONFIGURE_ARGS+=--disable-gui
 PLIST_SUB+=	CORE="" GUI="@comment " GUICORE="@comment "
-CONFLICTS+=	mldonkey-core-[0.9]* mldonkey-core-stable-[0.9]* \
-		mldonkey-devel-[0-9]*
-PKGNAMESUFFIX=	-core-devel
-.else
-PLIST_SUB+=	GUI=""
-CONFLICTS+=	mldonkey-gui-[0.9]*
-.if !defined(WITHOUT_CORE)
-CONFLICTS+=	mldonkey-devel-[0-9]*
-.endif
+. endif # defined(WITHOUT_GUI)
+
+. if defined(WITHOUT_CORE)
+PKGNAMESUFFIX=	-gui-devel
+
+CONFLICTS+=	mldonkey-core-devel-[0.9]*
+
+PLIST_SUB+=	CORE="@comment " GUI="" GUICORE="@comment "
+. endif # defined(WITHOUT_CORE)
+
+.endif # !(defined(WITHOUT_GUI) || defined(WITHOUT_CORE))
+
+.if !defined(WITHOUT_GUI)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/lablgtk2/lablrsvg.cma:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
 LIB_DEPENDS+=	rsvg-2.2:${PORTSDIR}/graphics/librsvg2
 
 CONFIGURE_ARGS+=--enable-gui=newgui2
 # we don't need lablgtk as RUN dependency, but we need gtk+glib
 USE_GNOME=	gtk20
+.endif # !defined(WITHOUT_GUI)
 
-MAKE_ENV+=	OCAMLRUNPARAM="l=256M"
-.if defined(WITHOUT_CORE)
-PKGNAMESUFFIX=	-gui-devel
-PLIST_SUB+=	CORE="@comment " GUICORE="@comment "
-.else
-PLIST_SUB+=	CORE=""	GUICORE=""
-.endif
-.endif
-.if defined(WITHOUT_GD)
-CONFIGURE_ARGS+=--disable-gd
-.elif !defined(WITHOUT_CORE)
+.if !defined(WITHOUT_CORE)
+USE_RC_SUBR=	mlnet
+
+. if !defined(WITHOUT_GD)
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
+. else
+CONFIGURE_ARGS+=--disable-gd
+. endif
 .endif
 
 DOCFILES=	Authors.txt Bugs.txt ChangeLog Developers.txt \
diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo
index 555fdd148cb7..4c9929a646e8 100644
--- a/net-p2p/mldonkey-devel/distinfo
+++ b/net-p2p/mldonkey-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mldonkey-2.8.3.tar.bz2) = 415eec223b97f50e6bbc4126980b3836
-SHA256 (mldonkey-2.8.3.tar.bz2) = 454860f3dddd7e72eb97bcb57a7d2aef9b509cf0d989e0dc0c2f5f38b335663f
-SIZE (mldonkey-2.8.3.tar.bz2) = 2659818
+MD5 (mldonkey-2.8.4.tar.bz2) = dfe0bf768ea8cd2f5094b1cbc8d7469b
+SHA256 (mldonkey-2.8.4.tar.bz2) = 71d069dff71649e98978391158140a54c4e72ad2545e40298d12de4440a98720
+SIZE (mldonkey-2.8.4.tar.bz2) = 2665209
diff --git a/net-p2p/mldonkey-devel/files/kill_mldonkey b/net-p2p/mldonkey-devel/files/kill_mldonkey
index 17a7de100aad..71c40bc1ac83 100644
--- a/net-p2p/mldonkey-devel/files/kill_mldonkey
+++ b/net-p2p/mldonkey-devel/files/kill_mldonkey
@@ -1,4 +1,7 @@
+#!/bin/sh
 #
+# $FreeBSD$
+
 # Copyright (c) 2003
 # Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # Holger Lamm <holger@e-gitt.net>
@@ -26,26 +29,26 @@
 # SUCH DAMAGE.
 #
 
-#!/bin/sh
-
 #
 # Add Username and password here
 # like this:
 #
-HTTPUSER="you"
-HTTPPASS="yourpassword"
-
-# Add location and port of mldonkey core
-HTTPURL="127.0.0.1:4080"
+#MLNETUSER="admin"
+#MLNETPASS=""
+#MLNETHOST="127.0.0.1"
+#MLNETPORT="4080"
 
 # internal configuration
 HTTP_COMMAND="/usr/bin/fetch"
-HTTP_COMMAND_ARGS="-1 -q -s"
+HTTP_COMMAND_ARGS="-1 -q -s -o /dev/null"
 
-if [ -n "${HTTPUSER}" -a -n "${HTTPPASS}" ]
-then
-	export HTTP_AUTH=basic:*:${HTTPUSER}:${HTTPPASS}
+if [ -n "${MLNETPASS}" ]; then
+	export HTTP_AUTH=basic:*:${MLNETUSER:-admin}:${MLNETPASS}
 fi
 
-${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} "http://${HTTPURL}/submit?q=kill"
+exec > /dev/null 2>&1
+
+${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} \
+	"http://${MLNETHOST:-127.0.0.1}:${MLNETPORT:-4080}/submit?q=kill" \
+	2>&1 > /dev/null
 
diff --git a/net-p2p/mldonkey-devel/files/mlnet.in b/net-p2p/mldonkey-devel/files/mlnet.in
index 128ff3835178..8405a66675cd 100644
--- a/net-p2p/mldonkey-devel/files/mlnet.in
+++ b/net-p2p/mldonkey-devel/files/mlnet.in
@@ -49,18 +49,20 @@ start_cmd()
 {
   if [ -n "${mlnet_logfile}" ]; then
     mlnet_logcommand="-log_file ${mlnet_logfile}"
+  else
+    mlnet_logfile="/dev/null"
   fi
 
   if [ "x${mlnet_user}" = "x$(whoami)" ]; then
     eval "${command} \
 	${mlnet_logcommand} \
 	${mlnet_flags} \
-	>/dev/null &"
+	>> ${mlnet_logfile} 2>&1 &"
   else
     su -l ${mlnet_user} -c "${command} \
 	${mlnet_logcommand} \
 	${mlnet_flags} \
-	>/dev/null &"
+	>> ${mlnet_logfile} 2>&1 &"
   fi
 }