12 files changed, 72 insertions, 90 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 248129472ff2..0b8fa61efbe5 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	aMule
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 CATEGORIES=	net-p2p
-MASTER_SITES=	http://download.berlios.de/amule/
+#MASTER_SITES=	http://download.berlios.de/amule/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	amule
 
 MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	The all-platform eMule p2p client
@@ -21,6 +23,7 @@ LIB_DEPENDS=	wx_gtk2u_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
 LATEST_LINK=	aMule2
 CONFLICTS=	aMule-1.* aMule-devel-[0-9]*
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
@@ -54,7 +57,7 @@ CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		"Won't compile on FreeBSD 4.x - See net-p2p/amule1 for 4.x compatibility."
+BROKEN=		Will not compile on FreeBSD 4.x - See net-p2p/amule1 for 4.x compatibility
 .endif
 
 # Configure options
@@ -107,8 +110,7 @@ PLIST_SUB+=		PL_ALC="@comment "
 .if defined(WITH_AMULEDAEMON)
 CONFIGURE_ARGS+=	--enable-amule-daemon --enable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON=""
-USE_RC_SUBR=		yes
-RCSCRIPT=		${PREFIX}/etc/rc.d/amuled.sh
+USE_RC_SUBR=		amuled.sh
 .else
 CONFIGURE_ARGS+=	--disable-amule-daemon --disable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON="@comment "
@@ -117,13 +119,7 @@ PLIST_SUB+=		PL_AMULEDAEMON="@comment "
 # Man pages management
 .include "Makefile.man"
 
-# Copy startup script if needed (amuledaemon compiled)
 post-install:
-.if defined(WITH_AMULEDAEMON)
-	${ECHO} "Installing ${RCSCRIPT} startup file."
-	${INSTALL_SCRIPT} ${FILESDIR}/amuled.sh ${RCSCRIPT}
-.endif
-
 # fr manpages are still incomplete and can't be managed
 # by MANLANG. Will be done when pages are complete.
 .if defined(WITH_AMULECMD)
diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo
index 71707e5c7a2e..01a0083de4a7 100644
--- a/net-p2p/amule-devel/distinfo
+++ b/net-p2p/amule-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (aMule-2.1.0.tar.gz) = f2582a1d51766927386592d07dee85be
-SHA256 (aMule-2.1.0.tar.gz) = 5be6001e381f8157ef50122a7b3c8d3e6fac3e37dfb8d14ed1d6444b99175a3a
-SIZE (aMule-2.1.0.tar.gz) = 4092686
+MD5 (aMule-2.1.1.tar.bz2) = a25521d358f65ae45744ee0099922069
+SHA256 (aMule-2.1.1.tar.bz2) = c675c7b1d97b14b410747af5d91185ec5f0cc55d8cfbd77b4525d47ef8756ea6
+SIZE (aMule-2.1.1.tar.bz2) = 3263428
diff --git a/net-p2p/amule-devel/files/amuled.sh b/net-p2p/amule-devel/files/amuled.sh.in
index 8e4d5d366974..a3316a9b1ca2 100644
--- a/net-p2p/amule-devel/files/amuled.sh
+++ b/net-p2p/amule-devel/files/amuled.sh.in
@@ -19,7 +19,7 @@
 # amuled_home (str): Set to home directory of user running amuled
 #                    (default /home/${amuled_user})
 #
-. /etc/rc.subr
+. %%RC_SUBR%%
 
 name="amuled"
 rcvar=`set_rcvar`
diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index 6059a3f4976c..cf83f7f924b1 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -1,5 +1,3 @@
-%%PL_AMULEDAEMON%%@unexec %D/etc/rc.d/amuled.sh stop > /dev/null 2>&1 || true
-%%PL_AMULEDAEMON%%etc/rc.d/amuled.sh
 %%PL_ALC%%man/fr/man1/alcc.1.gz
 %%PL_AMULEWEBSRV%%man/fr/man1/amuleweb.1.gz
 %%PL_AMULECMD%%man/fr/man1/amulecmd.1.gz
@@ -41,19 +39,19 @@ share/locale/sl/LC_MESSAGES/amule.mo
 @dirrmtry share/locale/it_CH
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-share/gnome/doc/aMule-2.1.0/ABOUT-NLS
-share/gnome/doc/aMule-2.1.0/amulesig.txt
-share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt
-share/gnome/doc/aMule-2.1.0/Changelog
-share/gnome/doc/aMule-2.1.0/Doxyfile
-share/gnome/doc/aMule-2.1.0/ED2K-Links.HOWTO
-share/gnome/doc/aMule-2.1.0/INSTALL
-share/gnome/doc/aMule-2.1.0/license.txt
-share/gnome/doc/aMule-2.1.0/README
-share/gnome/doc/aMule-2.1.0/TODO
-share/gnome/doc/aMule-2.1.0/EC_Protocol.txt
-share/gnome/doc/aMule-2.1.0/socks4.protocol
-@dirrmtry share/gnome/doc/aMule-2.1.0
+share/gnome/doc/aMule-2.1.1/ABOUT-NLS
+share/gnome/doc/aMule-2.1.1/amulesig.txt
+share/gnome/doc/aMule-2.1.1/amule-win32.HOWTO.txt
+share/gnome/doc/aMule-2.1.1/Changelog
+share/gnome/doc/aMule-2.1.1/Doxyfile
+share/gnome/doc/aMule-2.1.1/ED2K-Links.HOWTO
+share/gnome/doc/aMule-2.1.1/INSTALL
+share/gnome/doc/aMule-2.1.1/license.txt
+share/gnome/doc/aMule-2.1.1/README
+share/gnome/doc/aMule-2.1.1/TODO
+share/gnome/doc/aMule-2.1.1/EC_Protocol.txt
+share/gnome/doc/aMule-2.1.1/socks4.protocol
+@dirrmtry share/gnome/doc/aMule-2.1.1
 @dirrmtry share/gnome/doc
 %%PL_CAS%%share/gnome/cas/tmp.html
 %%PL_CAS%%share/gnome/cas/stat.png
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 248129472ff2..0b8fa61efbe5 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	aMule
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 CATEGORIES=	net-p2p
-MASTER_SITES=	http://download.berlios.de/amule/
+#MASTER_SITES=	http://download.berlios.de/amule/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	amule
 
 MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	The all-platform eMule p2p client
@@ -21,6 +23,7 @@ LIB_DEPENDS=	wx_gtk2u_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
 LATEST_LINK=	aMule2
 CONFLICTS=	aMule-1.* aMule-devel-[0-9]*
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
@@ -54,7 +57,7 @@ CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		"Won't compile on FreeBSD 4.x - See net-p2p/amule1 for 4.x compatibility."
+BROKEN=		Will not compile on FreeBSD 4.x - See net-p2p/amule1 for 4.x compatibility
 .endif
 
 # Configure options
@@ -107,8 +110,7 @@ PLIST_SUB+=		PL_ALC="@comment "
 .if defined(WITH_AMULEDAEMON)
 CONFIGURE_ARGS+=	--enable-amule-daemon --enable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON=""
-USE_RC_SUBR=		yes
-RCSCRIPT=		${PREFIX}/etc/rc.d/amuled.sh
+USE_RC_SUBR=		amuled.sh
 .else
 CONFIGURE_ARGS+=	--disable-amule-daemon --disable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON="@comment "
@@ -117,13 +119,7 @@ PLIST_SUB+=		PL_AMULEDAEMON="@comment "
 # Man pages management
 .include "Makefile.man"
 
-# Copy startup script if needed (amuledaemon compiled)
 post-install:
-.if defined(WITH_AMULEDAEMON)
-	${ECHO} "Installing ${RCSCRIPT} startup file."
-	${INSTALL_SCRIPT} ${FILESDIR}/amuled.sh ${RCSCRIPT}
-.endif
-
 # fr manpages are still incomplete and can't be managed
 # by MANLANG. Will be done when pages are complete.
 .if defined(WITH_AMULECMD)
diff --git a/net-p2p/amule/distinfo b/net-p2p/amule/distinfo
index 71707e5c7a2e..01a0083de4a7 100644
--- a/net-p2p/amule/distinfo
+++ b/net-p2p/amule/distinfo
@@ -1,3 +1,3 @@
-MD5 (aMule-2.1.0.tar.gz) = f2582a1d51766927386592d07dee85be
-SHA256 (aMule-2.1.0.tar.gz) = 5be6001e381f8157ef50122a7b3c8d3e6fac3e37dfb8d14ed1d6444b99175a3a
-SIZE (aMule-2.1.0.tar.gz) = 4092686
+MD5 (aMule-2.1.1.tar.bz2) = a25521d358f65ae45744ee0099922069
+SHA256 (aMule-2.1.1.tar.bz2) = c675c7b1d97b14b410747af5d91185ec5f0cc55d8cfbd77b4525d47ef8756ea6
+SIZE (aMule-2.1.1.tar.bz2) = 3263428
diff --git a/net-p2p/amule/files/amuled.sh b/net-p2p/amule/files/amuled.sh.in
index 8e4d5d366974..a3316a9b1ca2 100644
--- a/net-p2p/amule/files/amuled.sh
+++ b/net-p2p/amule/files/amuled.sh.in
@@ -19,7 +19,7 @@
 # amuled_home (str): Set to home directory of user running amuled
 #                    (default /home/${amuled_user})
 #
-. /etc/rc.subr
+. %%RC_SUBR%%
 
 name="amuled"
 rcvar=`set_rcvar`
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index 6059a3f4976c..cf83f7f924b1 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -1,5 +1,3 @@
-%%PL_AMULEDAEMON%%@unexec %D/etc/rc.d/amuled.sh stop > /dev/null 2>&1 || true
-%%PL_AMULEDAEMON%%etc/rc.d/amuled.sh
 %%PL_ALC%%man/fr/man1/alcc.1.gz
 %%PL_AMULEWEBSRV%%man/fr/man1/amuleweb.1.gz
 %%PL_AMULECMD%%man/fr/man1/amulecmd.1.gz
@@ -41,19 +39,19 @@ share/locale/sl/LC_MESSAGES/amule.mo
 @dirrmtry share/locale/it_CH
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-share/gnome/doc/aMule-2.1.0/ABOUT-NLS
-share/gnome/doc/aMule-2.1.0/amulesig.txt
-share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt
-share/gnome/doc/aMule-2.1.0/Changelog
-share/gnome/doc/aMule-2.1.0/Doxyfile
-share/gnome/doc/aMule-2.1.0/ED2K-Links.HOWTO
-share/gnome/doc/aMule-2.1.0/INSTALL
-share/gnome/doc/aMule-2.1.0/license.txt
-share/gnome/doc/aMule-2.1.0/README
-share/gnome/doc/aMule-2.1.0/TODO
-share/gnome/doc/aMule-2.1.0/EC_Protocol.txt
-share/gnome/doc/aMule-2.1.0/socks4.protocol
-@dirrmtry share/gnome/doc/aMule-2.1.0
+share/gnome/doc/aMule-2.1.1/ABOUT-NLS
+share/gnome/doc/aMule-2.1.1/amulesig.txt
+share/gnome/doc/aMule-2.1.1/amule-win32.HOWTO.txt
+share/gnome/doc/aMule-2.1.1/Changelog
+share/gnome/doc/aMule-2.1.1/Doxyfile
+share/gnome/doc/aMule-2.1.1/ED2K-Links.HOWTO
+share/gnome/doc/aMule-2.1.1/INSTALL
+share/gnome/doc/aMule-2.1.1/license.txt
+share/gnome/doc/aMule-2.1.1/README
+share/gnome/doc/aMule-2.1.1/TODO
+share/gnome/doc/aMule-2.1.1/EC_Protocol.txt
+share/gnome/doc/aMule-2.1.1/socks4.protocol
+@dirrmtry share/gnome/doc/aMule-2.1.1
 @dirrmtry share/gnome/doc
 %%PL_CAS%%share/gnome/cas/tmp.html
 %%PL_CAS%%share/gnome/cas/stat.png
diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile
index 248129472ff2..0b8fa61efbe5 100644
--- a/net-p2p/amule2/Makefile
+++ b/net-p2p/amule2/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	aMule
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 CATEGORIES=	net-p2p
-MASTER_SITES=	http://download.berlios.de/amule/
+#MASTER_SITES=	http://download.berlios.de/amule/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	amule
 
 MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	The all-platform eMule p2p client
@@ -21,6 +23,7 @@ LIB_DEPENDS=	wx_gtk2u_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
 LATEST_LINK=	aMule2
 CONFLICTS=	aMule-1.* aMule-devel-[0-9]*
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
@@ -54,7 +57,7 @@ CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		"Won't compile on FreeBSD 4.x - See net-p2p/amule1 for 4.x compatibility."
+BROKEN=		Will not compile on FreeBSD 4.x - See net-p2p/amule1 for 4.x compatibility
 .endif
 
 # Configure options
@@ -107,8 +110,7 @@ PLIST_SUB+=		PL_ALC="@comment "
 .if defined(WITH_AMULEDAEMON)
 CONFIGURE_ARGS+=	--enable-amule-daemon --enable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON=""
-USE_RC_SUBR=		yes
-RCSCRIPT=		${PREFIX}/etc/rc.d/amuled.sh
+USE_RC_SUBR=		amuled.sh
 .else
 CONFIGURE_ARGS+=	--disable-amule-daemon --disable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON="@comment "
@@ -117,13 +119,7 @@ PLIST_SUB+=		PL_AMULEDAEMON="@comment "
 # Man pages management
 .include "Makefile.man"
 
-# Copy startup script if needed (amuledaemon compiled)
 post-install:
-.if defined(WITH_AMULEDAEMON)
-	${ECHO} "Installing ${RCSCRIPT} startup file."
-	${INSTALL_SCRIPT} ${FILESDIR}/amuled.sh ${RCSCRIPT}
-.endif
-
 # fr manpages are still incomplete and can't be managed
 # by MANLANG. Will be done when pages are complete.
 .if defined(WITH_AMULECMD)
diff --git a/net-p2p/amule2/distinfo b/net-p2p/amule2/distinfo
index 71707e5c7a2e..01a0083de4a7 100644
--- a/net-p2p/amule2/distinfo
+++ b/net-p2p/amule2/distinfo
@@ -1,3 +1,3 @@
-MD5 (aMule-2.1.0.tar.gz) = f2582a1d51766927386592d07dee85be
-SHA256 (aMule-2.1.0.tar.gz) = 5be6001e381f8157ef50122a7b3c8d3e6fac3e37dfb8d14ed1d6444b99175a3a
-SIZE (aMule-2.1.0.tar.gz) = 4092686
+MD5 (aMule-2.1.1.tar.bz2) = a25521d358f65ae45744ee0099922069
+SHA256 (aMule-2.1.1.tar.bz2) = c675c7b1d97b14b410747af5d91185ec5f0cc55d8cfbd77b4525d47ef8756ea6
+SIZE (aMule-2.1.1.tar.bz2) = 3263428
diff --git a/net-p2p/amule2/files/amuled.sh b/net-p2p/amule2/files/amuled.sh.in
index 8e4d5d366974..a3316a9b1ca2 100644
--- a/net-p2p/amule2/files/amuled.sh
+++ b/net-p2p/amule2/files/amuled.sh.in
@@ -19,7 +19,7 @@
 # amuled_home (str): Set to home directory of user running amuled
 #                    (default /home/${amuled_user})
 #
-. /etc/rc.subr
+. %%RC_SUBR%%
 
 name="amuled"
 rcvar=`set_rcvar`
diff --git a/net-p2p/amule2/pkg-plist b/net-p2p/amule2/pkg-plist
index 6059a3f4976c..cf83f7f924b1 100644
--- a/net-p2p/amule2/pkg-plist
+++ b/net-p2p/amule2/pkg-plist
@@ -1,5 +1,3 @@
-%%PL_AMULEDAEMON%%@unexec %D/etc/rc.d/amuled.sh stop > /dev/null 2>&1 || true
-%%PL_AMULEDAEMON%%etc/rc.d/amuled.sh
 %%PL_ALC%%man/fr/man1/alcc.1.gz
 %%PL_AMULEWEBSRV%%man/fr/man1/amuleweb.1.gz
 %%PL_AMULECMD%%man/fr/man1/amulecmd.1.gz
@@ -41,19 +39,19 @@ share/locale/sl/LC_MESSAGES/amule.mo
 @dirrmtry share/locale/it_CH
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-share/gnome/doc/aMule-2.1.0/ABOUT-NLS
-share/gnome/doc/aMule-2.1.0/amulesig.txt
-share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt
-share/gnome/doc/aMule-2.1.0/Changelog
-share/gnome/doc/aMule-2.1.0/Doxyfile
-share/gnome/doc/aMule-2.1.0/ED2K-Links.HOWTO
-share/gnome/doc/aMule-2.1.0/INSTALL
-share/gnome/doc/aMule-2.1.0/license.txt
-share/gnome/doc/aMule-2.1.0/README
-share/gnome/doc/aMule-2.1.0/TODO
-share/gnome/doc/aMule-2.1.0/EC_Protocol.txt
-share/gnome/doc/aMule-2.1.0/socks4.protocol
-@dirrmtry share/gnome/doc/aMule-2.1.0
+share/gnome/doc/aMule-2.1.1/ABOUT-NLS
+share/gnome/doc/aMule-2.1.1/amulesig.txt
+share/gnome/doc/aMule-2.1.1/amule-win32.HOWTO.txt
+share/gnome/doc/aMule-2.1.1/Changelog
+share/gnome/doc/aMule-2.1.1/Doxyfile
+share/gnome/doc/aMule-2.1.1/ED2K-Links.HOWTO
+share/gnome/doc/aMule-2.1.1/INSTALL
+share/gnome/doc/aMule-2.1.1/license.txt
+share/gnome/doc/aMule-2.1.1/README
+share/gnome/doc/aMule-2.1.1/TODO
+share/gnome/doc/aMule-2.1.1/EC_Protocol.txt
+share/gnome/doc/aMule-2.1.1/socks4.protocol
+@dirrmtry share/gnome/doc/aMule-2.1.1
 @dirrmtry share/gnome/doc
 %%PL_CAS%%share/gnome/cas/tmp.html
 %%PL_CAS%%share/gnome/cas/stat.png