2010-01-22 net/mpd: obsoleted, unsupported port. Use net/mpd4, net/mpd5 instead

Feature safe: yes

15 files changed, 1 insertions, 359 deletions

diff --git a/MOVED b/MOVED
index 19d12e3cb138..929523044143 100644
--- a/MOVED
+++ b/MOVED
@@ -4327,3 +4327,4 @@ net-p2p/rblibtorrent-devel|net-p2p/libtorrent-rasterbar-14|2010-02-21|No longer
 sysutils/munin-main|sysutils/munin-master|2010-02-22|Reorganized upstream
 multimedia/tsMuxeR|multimedia/linux-tsmuxer|2010-02-24|Port was given a better name
 japanese/stardict-dict-ja||2010-02-25|Please use japanese/stardict-dict-ja
+net/mpd||2010-02-25|Has expired: obsoleted, unsupported port. Use net/mpd4, net/mpd5 instead
diff --git a/net/Makefile b/net/Makefile
index ef2344627cdd..32ac08949a13 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -370,7 +370,6 @@
     SUBDIR += mono-zeroconf
     SUBDIR += mopd
     SUBDIR += morebalance
-    SUBDIR += mpd
     SUBDIR += mpd-l2tp-ipv6pd-client
     SUBDIR += mpd4
     SUBDIR += mpd5
diff --git a/net/mpd/Makefile b/net/mpd/Makefile
deleted file mode 100644
index 27422bfcd02a..000000000000
--- a/net/mpd/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for:	mpd
-# Date created:				25 Feb 1999
-# Whom:					Archie Cobbs
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mpd
-PORTVERSION=	3.18
-PORTREVISION=	6
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	archie
-DIST_SUBDIR=	mpd
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Multi-link PPP daemon based on netgraph(4) [legacy version]
-
-DEPRECATED=	obsoleted, unsupported port. Use net/mpd4, net/mpd5 instead
-EXPIRATION_DATE=	2010-01-22
-
-# lang/mpd
-CONFLICTS=	mpd-[^3]*
-
-MAN8=		mpd.8
-MANCOMPRESSED=	maybe
-
-USE_OPENSSL=	yes
-MAKE_ENV=	COPTS="${COPTS} -I${OPENSSLINC}" LDADD="${LDADD} -L${OPENSSLLIB}"
-
-USE_RC_SUBR=	mpd
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	${FIND} ${WRKSRC}/src -type f -name \*.c \
-	| ${XARGS} ${GREP} -l 'NG_....LEN[ +1]*' \
-	| ${XARGS} ${REINPLACE_CMD} 's/\(NG_....\)LEN[ +1]*/\1SIZ/g'
-
-pre-build:
-	@${ECHO}
-	@${ECHO} "Use WITH_OPENSSL_PORT=yes if you use OPENSSL from ports"
-	@${ECHO}
-
-pre-install:
-	@${MKDIR} ${PREFIX}/etc/mpd
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/mpd/distinfo b/net/mpd/distinfo
deleted file mode 100644
index 389a95be5f39..000000000000
--- a/net/mpd/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mpd/mpd-3.18.tar.gz) = 4fdd913870dc29f29eed8f0442cd54bb
-SHA256 (mpd/mpd-3.18.tar.gz) = c17f7489c67180a89ac50505694b2bdc8031f6edbf92a474b8e74b50aca0f59d
-SIZE (mpd/mpd-3.18.tar.gz) = 329479
diff --git a/net/mpd/files/mpd.in b/net/mpd/files/mpd.in
deleted file mode 100644
index dfebc3e3b2a5..000000000000
--- a/net/mpd/files/mpd.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net/mpd/files/Attic/mpd.in,v 1.2 2009-07-15 16:55:51 dougb Exp $
-#
-# PROVIDE: mpd
-# REQUIRE: NETWORKING syslogd
-#
-# Add the following line to /etc/rc.conf[.local] to enable mpd:
-#
-# mpd_enable="YES"
-#
-# You can also set mpd_flags to any flags you want. The default is "-b".
-#
-
-mpd_flags="${mpd_flags:--b}"
-mpd_enable="${mpd_enable:-NO}"
-
-. %%RC_SUBR%%
-
-name=mpd
-rcvar=`set_rcvar`
-
-procname=%%PREFIX%%/sbin/mpd
-pidfile=/var/run/mpd.pid
-required_files="%%PREFIX%%/etc/mpd/mpd.conf %%PREFIX%%/etc/mpd/mpd.links"
-command="%%PREFIX%%/sbin/mpd"
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/mpd/files/patch-Makefile b/net/mpd/files/patch-Makefile
deleted file mode 100644
index be99c9a33f34..000000000000
--- a/net/mpd/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.orig	2004-05-04 18:12:28.000000000 +0200
-+++ ./Makefile	2009-04-15 10:00:46.339896422 +0200
-@@ -2,8 +2,6 @@
- 
- SUBDIR+=	src
- SUBDIR+=	conf
--.if !defined(NOPORTDOCS)
- SUBDIR+=	doc
--.endif
- 
- .include <bsd.subdir.mk>
diff --git a/net/mpd/files/patch-conf::Makefile b/net/mpd/files/patch-conf::Makefile
deleted file mode 100644
index 4a8f547d90ae..000000000000
--- a/net/mpd/files/patch-conf::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/Makefile.orig	2004-05-04 18:12:28.000000000 +0200
-+++ ./conf/Makefile	2009-04-15 11:09:12.907245101 +0200
-@@ -7,7 +7,7 @@
- MPD_SAMPLES+=	mpd.links.sample
- MPD_SAMPLES+=	mpd.secret.sample
- MPD_SAMPLES+=	mpd.script.sample
--NOOBJ=
-+NO_OBJ=
- 
- all clean cleandir depend:
- 
diff --git a/net/mpd/files/patch-src::Makefile b/net/mpd/files/patch-src::Makefile
deleted file mode 100644
index f9c6a22eb41e..000000000000
--- a/net/mpd/files/patch-src::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/Makefile.orig	2009-04-15 11:08:28.375892000 +0200
-+++ ./src/Makefile	2009-04-15 11:08:51.340371001 +0200
-@@ -11,7 +11,7 @@
- PREFIX?=		/usr/local
- BINDIR?=		${PREFIX}/sbin
- VERSION=		3.18
--NOMAN=
-+NO_MAN=
- 
- # Default configuration directory
- 
diff --git a/net/mpd/files/patch-src::custom.c b/net/mpd/files/patch-src::custom.c
deleted file mode 100644
index 0bec6ce12bd8..000000000000
--- a/net/mpd/files/patch-src::custom.c
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: src/custom.c
-===================================================================
-RCS file: /cvsroot/mpd/mpd/src/custom.c,v
-retrieving revision 1.1.2.1
-retrieving revision 1.1.2.2
-diff -u -r1.1.2.1 -r1.1.2.2
---- src/custom.c	26 Apr 2004 13:17:17 -0000	1.1.2.1
-+++ src/custom.c	10 Jan 2005 23:14:03 -0000	1.1.2.2
-@@ -141,16 +141,19 @@
-   if (!bund)
-     return;
- 
--  va_start(args, fmt);
-   if (l == NULL) {
-     for (k = 0; k < bund->n_links; k++) {
--      if (bund && bund->links[k])
-+      if (bund && bund->links[k]) {
-+	va_start(args, fmt);
- 	RecordLinkUpDownReason2(bund->links[k], up, key, fmt, args);
-+	va_end(args);
-+      }
-     }
-   } else {
-+    va_start(args, fmt);
-     RecordLinkUpDownReason2(l, up, key, fmt, args);
-+    va_end(args);
-   }
--  va_end(args);
- }
- 
- static void
diff --git a/net/mpd/files/patch-src::iface.h b/net/mpd/files/patch-src::iface.h
deleted file mode 100644
index 2b23ee683bcd..000000000000
--- a/net/mpd/files/patch-src::iface.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/iface.h.orig	Fri Dec 15 01:39:27 2006
-+++ src/iface.h	Fri Dec 15 01:40:35 2006
-@@ -21,6 +21,7 @@
- #include "mbuf.h"
- #include "timer.h"
- #include "vars.h"
-+#include "command.h"
- 
- /*
-  * DEFINITIONS
diff --git a/net/mpd/files/patch-src::log.c b/net/mpd/files/patch-src::log.c
deleted file mode 100644
index 83d46e5b01b5..000000000000
--- a/net/mpd/files/patch-src::log.c
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: src/log.c
-===================================================================
-RCS file: /cvsroot/mpd/mpd/src/log.c,v
-retrieving revision 1.4
-retrieving revision 1.4.2.1
-diff -u -r1.4 -r1.4.2.1
---- src/log.c	25 Nov 2002 23:51:41 -0000	1.4
-+++ src/log.c	7 Oct 2004 22:43:31 -0000	1.4.2.1
-@@ -265,17 +265,21 @@
- {
-   va_list	args;
- 
--  va_start(args, fmt);
-   LogTimeStamp(logprintf);
-+  va_start(args, fmt);
-   vlogprintf(fmt, args);
-+  va_end(args);
-+  va_start(args, fmt);
-   vlogprintf("\n", args);		/* XXX args will be ignored */
-+  va_end(args);
-   if (gLogOptions & LG_CONSOLE)
-   {
-+    va_start(args, fmt);
-     vfprintf(stdout, fmt, args);
-+    va_end(args);
-     putc('\n', stdout);
-     fflush(stdout);
-   }
--  va_end(args);
- }
- 
- /*
-@@ -315,12 +319,16 @@
- 
- /* Dump it */
- 
--  va_start(ap, fmt);
--  if (console)
-+  if (console) {
-+    va_start(ap, fmt);
-     LogDoDumpBp(printf, vprintf, FALSE, bp, fmt, ap);
--  if (log)
-+    va_end(ap);
-+  }
-+  if (log) {
-+    va_start(ap, fmt);
-     LogDoDumpBp(logprintf, vlogprintf, TRUE, bp, fmt, ap);
--  va_end(ap);
-+    va_end(ap);
-+  }
- }
- 
- /*
-@@ -342,11 +350,16 @@
- 
- /* Dump it */
- 
--  va_start(ap, fmt);
--  if (console)
-+  if (console) {
-+    va_start(ap, fmt);
-     LogDoDumpBuf(printf, vprintf, FALSE, buf, count, fmt, ap);
--  if (log)
-+    va_end(ap);
-+  }
-+  if (log) {
-+    va_start(ap, fmt);
-     LogDoDumpBuf(logprintf, vlogprintf, TRUE, buf, count, fmt, ap);
-+    va_end(ap);
-+  }
- }
- 
- /*
diff --git a/net/mpd/files/patch-src::modem.c b/net/mpd/files/patch-src::modem.c
deleted file mode 100644
index adf7cea289b4..000000000000
--- a/net/mpd/files/patch-src::modem.c
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: src/modem.c
-===================================================================
-RCS file: /cvsroot/mpd/mpd/src/modem.c,v
-retrieving revision 1.4
-retrieving revision 1.4.2.2
-diff -u -r1.4 -r1.4.2.2
---- src/modem.c	5 Dec 2002 22:01:40 -0000	1.4
-+++ src/modem.c	10 Jan 2005 23:14:03 -0000	1.4.2.2
-@@ -610,10 +617,12 @@
-   /* Concat prefix and message */
-   va_start(args, fmt);
-   vsnprintf(buf, sizeof(buf), fmt, args);
-+  va_end(args);
-   if (*buf != ' ')
-     snprintf(buf, sizeof(buf), "[%s] chat: ", lnk->name);
-   else
-     *buf = '\0';
-+  va_start(args, fmt);
-   vsnprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), fmt, args);
-   va_end(args);
- 
diff --git a/net/mpd/files/patch-src::radius.c b/net/mpd/files/patch-src::radius.c
deleted file mode 100644
index 7567c2f4a64b..000000000000
--- a/net/mpd/files/patch-src::radius.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/radius.c.orig	Fri Dec 15 01:42:07 2006
-+++ src/radius.c	Fri Dec 15 01:55:53 2006
-@@ -922,7 +922,7 @@
- 	      case RAD_MICROSOFT_MS_CHAP_ERROR:
- 		/* there is a nullbyte on the first pos, don't know why */
- 		if (((const char *)data)[0] == '\0') {
--		  ((const char *)data)++;
-+		  data+=sizeof(const char);
- 		  len--;
- 		}
- 		free(rad->mschap_error);
-@@ -945,7 +945,7 @@
- 		     * Only point at the String field if we don't think the
- 		     * peer has misformatted the response.
- 		     */
--		    ((const char *)data)++;
-+		    data+=sizeof(const char);
- 		    len--;
- 		  } else
- 		    Log(LG_RADIUS, ("[%s] RADIUS: %s: Warning: The MS-CHAP2-Success attribute is mis-formatted. Compensating",
diff --git a/net/mpd/pkg-descr b/net/mpd/pkg-descr
deleted file mode 100644
index fc56270bad01..000000000000
--- a/net/mpd/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Mpd is a netgraph(4) based implementation of the multi-link PPP
-protocol for FreeBSD.  It is designed to be both fast and flexible.
-It handles configuration and negotiation in user land, while routing
-all data packets strictly in the kernel.  It supports several of
-the numerous PPP sub-protocols and extensions, such as:
-
-      Multi-link PPP capability 
-      PAP, CHAP, and MS-CHAP authentication 
-      PPP compression and encryption
-      Point-to-Point Tunnelling Protocol (PPTP)
-      PPP over Ethernet (PPPoE)
-      RADIUS (authentication and accounting)
-
-Mpd also includes many additional features: 
-
-      Dial-on-demand with idle timeout 
-      Multiple active connections running simultaneously 
-      Dynamic demand based link management (also known as ``rubber bandwidth'') 
-      Powerful chat scripting language for asynchronous serial ports 
-      Pre-tested chat scripts for several common modems and ISDN TAs
-      Clean device-type independent design 
-      Comprehensive logging 
-
-WWW: http://sourceforge.net/projects/mpd/
diff --git a/net/mpd/pkg-plist b/net/mpd/pkg-plist
deleted file mode 100644
index a57f67f3340c..000000000000
--- a/net/mpd/pkg-plist
+++ /dev/null
@@ -1,63 +0,0 @@
-etc/mpd/mpd.conf.sample
-etc/mpd/mpd.links.sample
-etc/mpd/mpd.secret.sample
-etc/mpd/mpd.script.sample
-sbin/mpd
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/mpd.ps
-%%PORTDOCS%%%%DOCSDIR%%/mpd.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd1.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd10.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd11.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd12.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd13.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd14.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd15.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd16.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd17.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd18.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd19.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd2.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd20.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd21.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd22.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd23.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd24.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd25.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd26.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd27.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd28.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd29.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd3.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd30.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd31.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd32.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd33.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd34.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd35.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd36.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd37.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd38.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd39.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd4.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd40.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd41.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd42.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd43.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd44.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd45.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd46.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd47.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd48.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd49.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd5.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd50.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd51.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd52.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd6.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd7.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd8.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd9.html
-%%PORTDOCS%%%%DOCSDIR%%/mpd_toc.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/mpd