aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--net-p2p/amule1/Makefile3
-rw-r--r--net-p2p/amule1/pkg-descr5
-rw-r--r--net-p2p/amule1/pkg-plist64
-rw-r--r--net/Makefile2
-rw-r--r--net/amule/Makefile54
-rw-r--r--net/amule/distinfo2
-rw-r--r--net/amule/files/patch-SysTray.cpp12
-rw-r--r--net/amule/pkg-descr6
-rw-r--r--net/amule/pkg-plist81
-rw-r--r--net/amule1/Makefile3
-rw-r--r--net/amule1/pkg-descr5
-rw-r--r--net/amule1/pkg-plist64
13 files changed, 80 insertions, 222 deletions
diff --git a/MOVED b/MOVED
index 8b6b7071da7..bf7ac485c80 100644
--- a/MOVED
+++ b/MOVED
@@ -1488,3 +1488,4 @@ mail/sendmail811|mail/sendmail|2005-05-13|obsolete
games/xpilot-ng|games/xpilot-ng-server|2005-05-15|split into -client and -server
devel/p5-POE-Component-EasyDBI|databases/p5-POE-Component-EasyDBI|2005-05-15|move to a better category
www/mnogosearch|www/mnogosearch31|2004-05-15|finished repocopy
+net/amule|net/amule1|2005-05-16|renamed
diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile
index 12284d5c9a1..e054d206cb9 100644
--- a/net-p2p/amule1/Makefile
+++ b/net-p2p/amule1/Makefile
@@ -17,7 +17,8 @@ COMMENT= The all-platform eMule p2p client
LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
curl.3:${PORTSDIR}/ftp/curl
-CONFLICTS= aMule-devel-*
+LATEST_LINK= aMule1
+CONFLICTS= aMule-2.* aMule-devel-[0-9]*
USE_X_PREFIX= yes
USE_GNOME= gnomehier gnomehack gnomeprefix
diff --git a/net-p2p/amule1/pkg-descr b/net-p2p/amule1/pkg-descr
index afd986a280d..20b88a67602 100644
--- a/net-p2p/amule1/pkg-descr
+++ b/net-p2p/amule1/pkg-descr
@@ -3,4 +3,9 @@ aMule, the all-platform eMule p2p client
aMule is a multiplatform fork of xMule
client using wxWindows class library.
+This is the last version of aMule-1. It
+is maintained for 4.x compatibility. If
+you would like to install aMule-2, see
+amule2 or amule-devel port.
+
WWW: http://www.amule.org
diff --git a/net-p2p/amule1/pkg-plist b/net-p2p/amule1/pkg-plist
index 26fc7ecd7eb..72e8096fc80 100644
--- a/net-p2p/amule1/pkg-plist
+++ b/net-p2p/amule1/pkg-plist
@@ -4,37 +4,7 @@ bin/amulecmd
bin/amulecmdDLG
bin/amuleweb
bin/amulewebDLG
-share/gnome/pixmaps/amule.xpm
-share/gnome/applications/amule.desktop
-share/gnome/doc/aMule-1.2.8/ABOUT-NLS
-share/gnome/doc/aMule-1.2.8/AUTHORS
-share/gnome/doc/aMule-1.2.8/Changelog
-share/gnome/doc/aMule-1.2.8/ED2K-Links.HOWTO
-share/gnome/doc/aMule-1.2.8/INSTALL
-share/gnome/doc/aMule-1.2.8/README
-share/gnome/doc/aMule-1.2.8/TODO
-share/gnome/doc/aMule-1.2.8/amulesig.txt
-share/gnome/doc/aMule-1.2.8/eMule-Imports-Status
-share/gnome/doc/aMule-1.2.8/license.txt
-@dirrm share/gnome/doc/aMule-1.2.8
-@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
-share/locale/en/LC_MESSAGES/amule.mo
-share/locale/es/LC_MESSAGES/amule.mo
-share/locale/de/LC_MESSAGES/amule.mo
-share/locale/fr/LC_MESSAGES/amule.mo
-share/locale/it/LC_MESSAGES/amule.mo
-share/locale/ko/LC_MESSAGES/amule.mo
-share/locale/pl/LC_MESSAGES/amule.mo
-share/locale/ee/LC_MESSAGES/amule.mo
-@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ee 2>/dev/null || true
-share/locale/ru/LC_MESSAGES/amule.mo
-share/locale/bg/LC_MESSAGES/amule.mo
-share/locale/es_MX/LC_MESSAGES/amule.mo
-share/locale/pt_BR/LC_MESSAGES/amule.mo
-share/locale/gl/LC_MESSAGES/amule.mo
-share/locale/eu/LC_MESSAGES/amule.mo
-share/locale/nl/LC_MESSAGES/amule.mo
+share/gnome/amuleweb/aMule.tmpl
share/gnome/amuleweb/webserver/GraphCon.gif
share/gnome/amuleweb/webserver/GraphDL.gif
share/gnome/amuleweb/webserver/GraphUL.gif
@@ -76,6 +46,36 @@ share/gnome/amuleweb/webserver/top_bar_bg.gif
share/gnome/amuleweb/webserver/top_bar_bg2.gif
share/gnome/amuleweb/webserver/transparent.gif
share/gnome/amuleweb/webserver/yellow.gif
-share/gnome/amuleweb/aMule.tmpl
+share/gnome/applications/amule.desktop
+share/gnome/doc/aMule-1.2.8/ABOUT-NLS
+share/gnome/doc/aMule-1.2.8/AUTHORS
+share/gnome/doc/aMule-1.2.8/Changelog
+share/gnome/doc/aMule-1.2.8/ED2K-Links.HOWTO
+share/gnome/doc/aMule-1.2.8/INSTALL
+share/gnome/doc/aMule-1.2.8/README
+share/gnome/doc/aMule-1.2.8/TODO
+share/gnome/doc/aMule-1.2.8/amulesig.txt
+share/gnome/doc/aMule-1.2.8/eMule-Imports-Status
+share/gnome/doc/aMule-1.2.8/license.txt
+share/gnome/pixmaps/amule.xpm
+share/locale/bg/LC_MESSAGES/amule.mo
+share/locale/de/LC_MESSAGES/amule.mo
+share/locale/ee/LC_MESSAGES/amule.mo
+share/locale/en/LC_MESSAGES/amule.mo
+share/locale/es/LC_MESSAGES/amule.mo
+share/locale/es_MX/LC_MESSAGES/amule.mo
+share/locale/eu/LC_MESSAGES/amule.mo
+share/locale/fr/LC_MESSAGES/amule.mo
+share/locale/gl/LC_MESSAGES/amule.mo
+share/locale/it/LC_MESSAGES/amule.mo
+share/locale/ko/LC_MESSAGES/amule.mo
+share/locale/nl/LC_MESSAGES/amule.mo
+share/locale/pl/LC_MESSAGES/amule.mo
+share/locale/pt_BR/LC_MESSAGES/amule.mo
+share/locale/ru/LC_MESSAGES/amule.mo
+@dirrm share/gnome/doc/aMule-1.2.8
+@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
+@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ee 2>/dev/null || true
@dirrm share/gnome/amuleweb/webserver
@dirrm share/gnome/amuleweb
diff --git a/net/Makefile b/net/Makefile
index 8b37c80df15..58667a6d8ec 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -17,7 +17,7 @@
SUBDIR += aget
SUBDIR += aim
SUBDIR += amsn
- SUBDIR += amule
+ SUBDIR += amule1
SUBDIR += amule-devel
SUBDIR += apache-soap
SUBDIR += apinger
diff --git a/net/amule/Makefile b/net/amule/Makefile
deleted file mode 100644
index 12284d5c9a1..00000000000
--- a/net/amule/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# New ports collection makefile for: amule
-# Date created: Wed Nov 05 09:30:00 UTC 2003
-# Whom: Ganael LAPLANCHE <ganael.laplanche@martymac.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= aMule
-PORTVERSION= 1.2.8
-PORTREVISION= 2
-CATEGORIES= net
-MASTER_SITES= http://download.berlios.de/amule/
-
-MAINTAINER= ganael.laplanche@martymac.com
-COMMENT= The all-platform eMule p2p client
-
-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
- curl.3:${PORTSDIR}/ftp/curl
-
-CONFLICTS= aMule-devel-*
-
-USE_X_PREFIX= yes
-USE_GNOME= gnomehier gnomehack gnomeprefix
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-included-gettext \
- --with-libintl-prefix=${LOCALBASE} \
- --with-libiconv-prefix=${LOCALBASE} \
- --with-wx-config=${WX_CONFIG} \
- --with-wxbase-config=${WX_CONFIG} \
- --with-curl-config=${CURL_CONFIG} \
- --program-transform-name="s/ed2k/amule-ed2k-handler/"
-
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-OPTIONS= OPTIMIZE "Build with optimization" on \
- STATIC "Enable static linking" off
-
-WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config
-CURL_CONFIG?= ${LOCALBASE}/bin/curl-config
-
-.include <bsd.port.pre.mk>
-
-# Configure options
-.if !defined(WITHOUT_OPTIMIZE)
-CONFIGURE_ARGS+= --enable-optimise
-.endif
-
-.if defined(WITH_STATIC)
-CONFIGURE_ARGS+= --enable-static
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/amule/distinfo b/net/amule/distinfo
deleted file mode 100644
index adfd1fb00ae..00000000000
--- a/net/amule/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (aMule-1.2.8.tar.gz) = c2594ab3f7a5cb6f0d2eb68c7b5f9135
-SIZE (aMule-1.2.8.tar.gz) = 2506663
diff --git a/net/amule/files/patch-SysTray.cpp b/net/amule/files/patch-SysTray.cpp
deleted file mode 100644
index a313e720d9e..00000000000
--- a/net/amule/files/patch-SysTray.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/SysTray.cpp.orig Tue Jul 6 07:32:56 2004
-+++ src/SysTray.cpp Tue Jul 6 07:33:44 2004
-@@ -23,8 +23,8 @@
- #include "sys.h"
- #include <libintl.h>
- #include <clocale> // Needed for setlocale(3)
--#include <net/if.h> // Needed for struct ifreq
- #include <sys/socket.h> //
-+#include <net/if.h> // Needed for struct ifreq
- #include <netinet/in.h> // Needed for inet_ntoa
- #include <arpa/inet.h> //
- #include <sys/ioctl.h> // Needed for SIOCGIFADDR
diff --git a/net/amule/pkg-descr b/net/amule/pkg-descr
deleted file mode 100644
index afd986a280d..00000000000
--- a/net/amule/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-aMule, the all-platform eMule p2p client
-
-aMule is a multiplatform fork of xMule
-client using wxWindows class library.
-
-WWW: http://www.amule.org
diff --git a/net/amule/pkg-plist b/net/amule/pkg-plist
deleted file mode 100644
index 26fc7ecd7eb..00000000000
--- a/net/amule/pkg-plist
+++ /dev/null
@@ -1,81 +0,0 @@
-bin/amule
-bin/amule-ed2k-handler
-bin/amulecmd
-bin/amulecmdDLG
-bin/amuleweb
-bin/amulewebDLG
-share/gnome/pixmaps/amule.xpm
-share/gnome/applications/amule.desktop
-share/gnome/doc/aMule-1.2.8/ABOUT-NLS
-share/gnome/doc/aMule-1.2.8/AUTHORS
-share/gnome/doc/aMule-1.2.8/Changelog
-share/gnome/doc/aMule-1.2.8/ED2K-Links.HOWTO
-share/gnome/doc/aMule-1.2.8/INSTALL
-share/gnome/doc/aMule-1.2.8/README
-share/gnome/doc/aMule-1.2.8/TODO
-share/gnome/doc/aMule-1.2.8/amulesig.txt
-share/gnome/doc/aMule-1.2.8/eMule-Imports-Status
-share/gnome/doc/aMule-1.2.8/license.txt
-@dirrm share/gnome/doc/aMule-1.2.8
-@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
-share/locale/en/LC_MESSAGES/amule.mo
-share/locale/es/LC_MESSAGES/amule.mo
-share/locale/de/LC_MESSAGES/amule.mo
-share/locale/fr/LC_MESSAGES/amule.mo
-share/locale/it/LC_MESSAGES/amule.mo
-share/locale/ko/LC_MESSAGES/amule.mo
-share/locale/pl/LC_MESSAGES/amule.mo
-share/locale/ee/LC_MESSAGES/amule.mo
-@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ee 2>/dev/null || true
-share/locale/ru/LC_MESSAGES/amule.mo
-share/locale/bg/LC_MESSAGES/amule.mo
-share/locale/es_MX/LC_MESSAGES/amule.mo
-share/locale/pt_BR/LC_MESSAGES/amule.mo
-share/locale/gl/LC_MESSAGES/amule.mo
-share/locale/eu/LC_MESSAGES/amule.mo
-share/locale/nl/LC_MESSAGES/amule.mo
-share/gnome/amuleweb/webserver/GraphCon.gif
-share/gnome/amuleweb/webserver/GraphDL.gif
-share/gnome/amuleweb/webserver/GraphUL.gif
-share/gnome/amuleweb/webserver/add_server.gif
-share/gnome/amuleweb/webserver/arrow_down.gif
-share/gnome/amuleweb/webserver/arrow_right.gif
-share/gnome/amuleweb/webserver/arrow_up.gif
-share/gnome/amuleweb/webserver/black.gif
-share/gnome/amuleweb/webserver/blue.gif
-share/gnome/amuleweb/webserver/blue1.gif
-share/gnome/amuleweb/webserver/blue2.gif
-share/gnome/amuleweb/webserver/blue3.gif
-share/gnome/amuleweb/webserver/blue4.gif
-share/gnome/amuleweb/webserver/blue5.gif
-share/gnome/amuleweb/webserver/blue6.gif
-share/gnome/amuleweb/webserver/cp_download.gif
-share/gnome/amuleweb/webserver/cp_kad.gif
-share/gnome/amuleweb/webserver/cp_search.gif
-share/gnome/amuleweb/webserver/cp_servers.gif
-share/gnome/amuleweb/webserver/cp_settings.gif
-share/gnome/amuleweb/webserver/cp_shared.gif
-share/gnome/amuleweb/webserver/cp_stats.gif
-share/gnome/amuleweb/webserver/emule.gif
-share/gnome/amuleweb/webserver/green.gif
-share/gnome/amuleweb/webserver/greenpercent.gif
-share/gnome/amuleweb/webserver/l_cancel.gif
-share/gnome/amuleweb/webserver/l_connect.gif
-share/gnome/amuleweb/webserver/l_down.gif
-share/gnome/amuleweb/webserver/l_ed2klink.gif
-share/gnome/amuleweb/webserver/l_info.gif
-share/gnome/amuleweb/webserver/l_pause.gif
-share/gnome/amuleweb/webserver/l_resume.gif
-share/gnome/amuleweb/webserver/l_up.gif
-share/gnome/amuleweb/webserver/log.gif
-share/gnome/amuleweb/webserver/main_bg.gif
-share/gnome/amuleweb/webserver/main_top_bg.gif
-share/gnome/amuleweb/webserver/red.gif
-share/gnome/amuleweb/webserver/top_bar_bg.gif
-share/gnome/amuleweb/webserver/top_bar_bg2.gif
-share/gnome/amuleweb/webserver/transparent.gif
-share/gnome/amuleweb/webserver/yellow.gif
-share/gnome/amuleweb/aMule.tmpl
-@dirrm share/gnome/amuleweb/webserver
-@dirrm share/gnome/amuleweb
diff --git a/net/amule1/Makefile b/net/amule1/Makefile
index 12284d5c9a1..e054d206cb9 100644
--- a/net/amule1/Makefile
+++ b/net/amule1/Makefile
@@ -17,7 +17,8 @@ COMMENT= The all-platform eMule p2p client
LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
curl.3:${PORTSDIR}/ftp/curl
-CONFLICTS= aMule-devel-*
+LATEST_LINK= aMule1
+CONFLICTS= aMule-2.* aMule-devel-[0-9]*
USE_X_PREFIX= yes
USE_GNOME= gnomehier gnomehack gnomeprefix
diff --git a/net/amule1/pkg-descr b/net/amule1/pkg-descr
index afd986a280d..20b88a67602 100644
--- a/net/amule1/pkg-descr
+++ b/net/amule1/pkg-descr
@@ -3,4 +3,9 @@ aMule, the all-platform eMule p2p client
aMule is a multiplatform fork of xMule
client using wxWindows class library.
+This is the last version of aMule-1. It
+is maintained for 4.x compatibility. If
+you would like to install aMule-2, see
+amule2 or amule-devel port.
+
WWW: http://www.amule.org
diff --git a/net/amule1/pkg-plist b/net/amule1/pkg-plist
index 26fc7ecd7eb..72e8096fc80 100644
--- a/net/amule1/pkg-plist
+++ b/net/amule1/pkg-plist
@@ -4,37 +4,7 @@ bin/amulecmd
bin/amulecmdDLG
bin/amuleweb
bin/amulewebDLG
-share/gnome/pixmaps/amule.xpm
-share/gnome/applications/amule.desktop
-share/gnome/doc/aMule-1.2.8/ABOUT-NLS
-share/gnome/doc/aMule-1.2.8/AUTHORS
-share/gnome/doc/aMule-1.2.8/Changelog
-share/gnome/doc/aMule-1.2.8/ED2K-Links.HOWTO
-share/gnome/doc/aMule-1.2.8/INSTALL
-share/gnome/doc/aMule-1.2.8/README
-share/gnome/doc/aMule-1.2.8/TODO
-share/gnome/doc/aMule-1.2.8/amulesig.txt
-share/gnome/doc/aMule-1.2.8/eMule-Imports-Status
-share/gnome/doc/aMule-1.2.8/license.txt
-@dirrm share/gnome/doc/aMule-1.2.8
-@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
-share/locale/en/LC_MESSAGES/amule.mo
-share/locale/es/LC_MESSAGES/amule.mo
-share/locale/de/LC_MESSAGES/amule.mo
-share/locale/fr/LC_MESSAGES/amule.mo
-share/locale/it/LC_MESSAGES/amule.mo
-share/locale/ko/LC_MESSAGES/amule.mo
-share/locale/pl/LC_MESSAGES/amule.mo
-share/locale/ee/LC_MESSAGES/amule.mo
-@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ee 2>/dev/null || true
-share/locale/ru/LC_MESSAGES/amule.mo
-share/locale/bg/LC_MESSAGES/amule.mo
-share/locale/es_MX/LC_MESSAGES/amule.mo
-share/locale/pt_BR/LC_MESSAGES/amule.mo
-share/locale/gl/LC_MESSAGES/amule.mo
-share/locale/eu/LC_MESSAGES/amule.mo
-share/locale/nl/LC_MESSAGES/amule.mo
+share/gnome/amuleweb/aMule.tmpl
share/gnome/amuleweb/webserver/GraphCon.gif
share/gnome/amuleweb/webserver/GraphDL.gif
share/gnome/amuleweb/webserver/GraphUL.gif
@@ -76,6 +46,36 @@ share/gnome/amuleweb/webserver/top_bar_bg.gif
share/gnome/amuleweb/webserver/top_bar_bg2.gif
share/gnome/amuleweb/webserver/transparent.gif
share/gnome/amuleweb/webserver/yellow.gif
-share/gnome/amuleweb/aMule.tmpl
+share/gnome/applications/amule.desktop
+share/gnome/doc/aMule-1.2.8/ABOUT-NLS
+share/gnome/doc/aMule-1.2.8/AUTHORS
+share/gnome/doc/aMule-1.2.8/Changelog
+share/gnome/doc/aMule-1.2.8/ED2K-Links.HOWTO
+share/gnome/doc/aMule-1.2.8/INSTALL
+share/gnome/doc/aMule-1.2.8/README
+share/gnome/doc/aMule-1.2.8/TODO
+share/gnome/doc/aMule-1.2.8/amulesig.txt
+share/gnome/doc/aMule-1.2.8/eMule-Imports-Status
+share/gnome/doc/aMule-1.2.8/license.txt
+share/gnome/pixmaps/amule.xpm
+share/locale/bg/LC_MESSAGES/amule.mo
+share/locale/de/LC_MESSAGES/amule.mo
+share/locale/ee/LC_MESSAGES/amule.mo
+share/locale/en/LC_MESSAGES/amule.mo
+share/locale/es/LC_MESSAGES/amule.mo
+share/locale/es_MX/LC_MESSAGES/amule.mo
+share/locale/eu/LC_MESSAGES/amule.mo
+share/locale/fr/LC_MESSAGES/amule.mo
+share/locale/gl/LC_MESSAGES/amule.mo
+share/locale/it/LC_MESSAGES/amule.mo
+share/locale/ko/LC_MESSAGES/amule.mo
+share/locale/nl/LC_MESSAGES/amule.mo
+share/locale/pl/LC_MESSAGES/amule.mo
+share/locale/pt_BR/LC_MESSAGES/amule.mo
+share/locale/ru/LC_MESSAGES/amule.mo
+@dirrm share/gnome/doc/aMule-1.2.8
+@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
+@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ee 2>/dev/null || true
@dirrm share/gnome/amuleweb/webserver
@dirrm share/gnome/amuleweb