Remove expired ports:

2012-05-15 net/ng_car
2012-05-10 palm/coldsync

Approved by:	eadler (mentor)

20 files changed, 2 insertions, 408 deletions

diff --git a/MOVED b/MOVED
index ba52b03f633f..4c281b963e47 100644
--- a/MOVED
+++ b/MOVED
@@ -3394,3 +3394,5 @@ net/perldap||2012-05-18|Has expired: BROKEN for more than 6 month
 security/p5-Crypt-Cryptix||2012-05-18|Has expired: Gone from CPAN, project site says project is dead
 www/p5-HTML-Sanitizer||2012-05-18|Has expired: no longer in CPAN
 www/p5-IMDB-Movie||2012-05-18|Has expired: Removed from CPAN
+net/ng_car||2012-05-19|In base for all supported versions of FreeBSD
+palm/coldsync||2012-05-19|BROKEN for more than 6 month, does not compile
diff --git a/net/Makefile b/net/Makefile
index 872cda1218ec..cce6d91bfda0 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -414,7 +414,6 @@
     SUBDIR += netwib
     SUBDIR += neubot
     SUBDIR += nfsshell
-    SUBDIR += ng_car
     SUBDIR += ng_daphne
     SUBDIR += ng_mikrotik_eoip
     SUBDIR += ngrep
diff --git a/net/ng_car/Makefile b/net/ng_car/Makefile
deleted file mode 100644
index be1a6866ece2..000000000000
--- a/net/ng_car/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:	ng_car
-# Date Created:				Sep 26, 2005
-# Whom:					Nuno Antunes <nuno.antunes@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ng_car
-PORTVERSION=	0.6
-CATEGORIES=	net kld
-MASTER_SITES=	SF/mpd/misc/${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Netgraph committed access rate node
-
-NO_PACKAGE=	Should be in sync with the kernel to work correctly
-
-DEPRECATED=	In base for all supported versions of FreeBSD
-EXPIRATION_DATE=2012-05-15
-
-KMODDIR?=	/boot/modules
-PLIST_SUB=	KMODDIR=${KMODDIR}
-MAKE_ENV+=	KMODDIR="${KMODDIR}"
-
-MAN4=		ng_car.4
-MANCOMPRESSED=	yes
-
-.include <bsd.port.options.mk>
-
-.if !exists(${SRC_BASE}/sys/Makefile)
-IGNORE=	this port requires kernel sources
-.endif
-
-.if ${OSVERSION} >= 700041
-IGNORE=	already exists in base system
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net/ng_car/distinfo b/net/ng_car/distinfo
deleted file mode 100644
index c94eb0d799bb..000000000000
--- a/net/ng_car/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ng_car-0.6.tar.gz) = 76cd32e04c05ffa71f4808701d140b7339988d37f80e50966a31e33524bfc7a7
-SIZE (ng_car-0.6.tar.gz) = 8944
diff --git a/net/ng_car/pkg-descr b/net/ng_car/pkg-descr
deleted file mode 100644
index 18ea46b294f9..000000000000
--- a/net/ng_car/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The ng_car netgraph module is a "Committed Access Rate" implementation for
-netgraph. It provides an easy way to use a network interface at a rate below
-its specification. It uses a token bucket algorithm to measure and classify the
-network packets flowing through it. 
diff --git a/net/ng_car/pkg-message b/net/ng_car/pkg-message
deleted file mode 100644
index d74241a48c1a..000000000000
--- a/net/ng_car/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-*******************************************************************************
-*                                                                             *
-* This port contains a prebuilt kernel module. Due to the ever changing       *
-* nature of FreeBSD it may be necessary to rebuild the module after a kernel  *
-* source update.  To do this reinstall the port.                              *
-*                                                                             *
-*******************************************************************************
diff --git a/net/ng_car/pkg-plist b/net/ng_car/pkg-plist
deleted file mode 100644
index ade22fc5c1a9..000000000000
--- a/net/ng_car/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-include/netgraph/ng_car.h
-@dirrmtry include/netgraph
-@cwd %%KMODDIR%%
-ng_car.ko
-@unexec kldxref %D
diff --git a/palm/Makefile b/palm/Makefile
index bcbde7ee0f94..d15d2e068ee4 100644
--- a/palm/Makefile
+++ b/palm/Makefile
@@ -5,7 +5,6 @@
 
     SUBDIR += barry
     SUBDIR += bibelot
-    SUBDIR += coldsync
     SUBDIR += gnome-pilot
     SUBDIR += gnome-pilot-conduits
     SUBDIR += iSiloXC
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
deleted file mode 100644
index 82bb2ff8eeff..000000000000
--- a/palm/coldsync/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# New ports collection makefile for:	coldsync
-# Date created:		27 January 2000
-# Whom:			Andrew Arensburger <arensb+freebsd-ports@ooblick.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	coldsync
-PORTVERSION=	2.2.5
-PORTREVISION=	8
-CATEGORIES=	palm comms
-MASTER_SITES=	http://www.coldsync.org/download/
-
-MAINTAINER=	arensb+freebsd-ports@ooblick.com
-COMMENT=	Synchronize a PalmPilot with a Unix workstation
-
-DEPRECATED=	BROKEN for more than 6 month
-EXPIRATION_DATE=	2012-05-10
-
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--without-i18n
-PLIST_SUB+=	NLS="@comment "
-.else
-CONFIGURE_ARGS+=	--with-i18n
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-
-BROKEN=		does not compile
-.endif
-
-REINPLACE_ARGS=	-i "" -E
-
-USE_LDCONFIG=	yes
-
-GNU_CONFIGURE=	yes
-
-MAN3=		libpconn.3 DlpAddSyncLogEntry.3 DlpCallApplication.3 \
-		DlpCleanUpDataBase.3 DlpDeleteRecord.3 DlpEndOfSync.3 \
-		DlpGetSysDateTime.3 DlpMoveCategory.3 DlpOpenConduit.3 \
-		DlpOpenDB.3 DlpRPC.3 DlpReadAppBlock.3 \
-		DlpReadAppPreference.3 DlpReadDBList.3 DlpReadFeature.3 \
-		DlpReadNetSyncInfo.3 DlpReadOpenDBInfo.3 \
-		DlpReadRecordByID.3 DlpReadRecordIDList.3 \
-		DlpReadResourceByIndex.3 DlpReadStorageInfo.3 \
-		DlpReadSysInfo.3 DlpReadUserInfo.3 DlpResetRecordIndex.3 \
-		DlpResetSyncFlags.3 DlpResetSystem.3 DlpWriteRecord.3 \
-		DlpWriteResource.3 PConnClose.3 PConn_bind.3 \
-		RDLP_Backlight.3 RDLP_BatteryDialog.3 \
-		RDLP_GetOSVersionString.3 RDLP_MemHandleNew.3 \
-		RDLP_PluggedIn.3 RDLP_ROMToken.3 new_PConnection.3 \
-		time_dlp2palmtime.3 libpdb.3 new_Record.3 \
-		new_pdb.3 pdb_AppendRecord.3 pdb_CopyRecord.3 \
-		pdb_DeleteRecordByID.3 pdb_FindRecordByID.3 \
-		pdb_LoadHeader.3 pdb_Read.3
-MAN8=		coldsync.8
-MANCOMPRESSED=	no
-
-INFO=		conduits
-
-.include <bsd.port.pre.mk>
-
-CFLAGS+=	-O0 -D__BSD_VISIBLE=1 -I${LOCALBASE}/include
-CONFIGURE_ARGS+=	--disable-pedantic --without-perl --with-usb
-
-post-patch:
-	${REINPLACE_CMD} -e 's,udi\.([A-Za-z0-9]+),udi.udi_\1,g;' \
-		-e 's,ur\.([A-Za-z0-9]+),ur.ucr_\1,g;' \
-		${WRKSRC}/configure ${WRKSRC}/libpconn/PConnection_usb.c
-
-post-configure:
-	${REINPLACE_CMD} -e 's,-fpic,-fPIC,g' ${WRKSRC}/Make.rules
-
-post-install:
-	${MKDIR} ${PREFIX}/include/pconn
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/
-	${INSTALL_DATA} ${WRKSRC}/include/pconn/*.h ${PREFIX}/include/pconn/
-
-.include <bsd.port.post.mk>
diff --git a/palm/coldsync/distinfo b/palm/coldsync/distinfo
deleted file mode 100644
index 141ae99b1ec8..000000000000
--- a/palm/coldsync/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (coldsync-2.2.5.tar.gz) = 635575e2175a865827319ad21cbfbac95a42a7256730898ae9e9104b63b4fef6
-SIZE (coldsync-2.2.5.tar.gz) = 663307
diff --git a/palm/coldsync/files/patch-coldsync.c b/palm/coldsync/files/patch-coldsync.c
deleted file mode 100644
index dded030000e7..000000000000
--- a/palm/coldsync/files/patch-coldsync.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/coldsync.c.ORIG	Fri Apr 18 22:59:58 2003
-+++ src/coldsync.c	Fri Apr 18 23:10:57 2003
-@@ -622,7 +622,7 @@
- 
- 	time(&now);
- 	Verbose(1, _("Sync for %s at %s"),
--		(pda->name == NULL ? "unnamed PDA" : pda->name),
-+		(pda == NULL || pda->name == NULL ? "unnamed PDA" : pda->name),
- 		ctime(&now));
- 
- 	/* See if the userid matches. */
diff --git a/palm/coldsync/files/patch-dlp_cmd b/palm/coldsync/files/patch-dlp_cmd
deleted file mode 100644
index 6c65e292912c..000000000000
--- a/palm/coldsync/files/patch-dlp_cmd
+++ /dev/null
@@ -1,51 +0,0 @@
-
---- include/pconn/dlp_cmd.h.orig	Sat Oct  6 20:04:35 2001
-+++ include/pconn/dlp_cmd.h	Sun Jul 18 00:24:28 2004
-@@ -199,6 +199,9 @@
- #define DLPCMD_MODUIFLAG_VIEWERID	0x08	/* Viewer ID */
- 
- /** ReadSysInfo **/
-+#define DLPARG_ReadSysInfo_Ver		DLPARG_BASE
-+#define DLPARGLEN_ReadSysInfo_Ver	4
-+
- #define DLPRET_ReadSysInfo_Info		DLPRET_BASE
- #define DLPRETLEN_ReadSysInfo_Info	14
- 
---- libpconn/dlp_cmd.c.orig	Thu Oct 18 03:35:03 2001
-+++ libpconn/dlp_cmd.c	Sun Jul 18 00:24:28 2004
-@@ -343,7 +343,10 @@
- 	int err;
- 	struct dlp_req_header header;		/* Request header */
- 	struct dlp_resp_header resp_header;	/* Response header */
-+	struct dlp_arg argv[1];			/* Request argument list */
- 	const struct dlp_arg *ret_argv;	/* Response argument list */
-+	static ubyte outbuf[DLPARGLEN_ReadSysInfo_Ver]; 
-+						/* Buffer holding outgoing arg */
- 	const ubyte *rptr;	/* Pointer into buffers (for reading) */
- 
- 	DLPC_TRACE(1)
-@@ -351,10 +354,21 @@
- 
- 	/* Fill in the header values */
- 	header.id = (ubyte) DLPCMD_ReadSysInfo;
--	header.argc = 0;
-+	header.argc = 1;
-+
-+	/* Fill in the argument */
-+	
-+	outbuf[0] = 0x00; /* We are telling our peer we support */
-+	outbuf[1] = 0x01; /* DLP 1.3. Old PDAs will discard the argument. */
-+	outbuf[2] = 0x00; 
-+	outbuf[3] = 0x03;
-+	
-+	argv[0].id	= DLPARG_ReadSysInfo_Ver;
-+	argv[0].size	= DLPARGLEN_ReadSysInfo_Ver;
-+	argv[0].data	= outbuf;
- 
- 	/* Send the DLP request */
--	err = dlp_send_req(pconn, &header, NULL);
-+	err = dlp_send_req(pconn, &header, argv);
- 	if (err < 0)
- 		return err;
- 
-
diff --git a/palm/coldsync/files/patch-in6 b/palm/coldsync/files/patch-in6
deleted file mode 100644
index 861eb4d585af..000000000000
--- a/palm/coldsync/files/patch-in6
+++ /dev/null
@@ -1,17 +0,0 @@
---- libpconn/PConnection_net.c	Mon Nov 19 18:08:06 2001
-+++ libpconn/PConnection_net.c	Thu Dec 26 08:02:24 2002
-@@ -11,5 +11,5 @@
- #include <netdb.h>		/* For getservbyname() */
- #include <string.h>		/* For memset() */
--#if HAVE_INET_NTOP
-+#if HAVE_INET_NTOP && !defined(__FreeBSD__)
- #  include <arpa/nameser.h>	/* Solaris's <resolv.h> requires this */
- #  include <resolv.h>		/* For inet_ntop() under Solaris */
---- src/coldsync.c	Wed Nov 28 16:48:44 2001
-+++ src/coldsync.c	Thu Dec 26 08:26:47 2002
-@@ -8,2 +8,5 @@
-  */
-+#ifdef __FreeBSD__
-+#	define _POSIX_C_SOURCE 200112
-+#endif
- #include "config.h"
diff --git a/palm/coldsync/files/patch-libpconn_PConnection_usb.c b/palm/coldsync/files/patch-libpconn_PConnection_usb.c
deleted file mode 100644
index beffb7a0ddd8..000000000000
--- a/palm/coldsync/files/patch-libpconn_PConnection_usb.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- libpconn/PConnection_usb.c.orig	Thu Jul  1 01:51:27 2004
-+++ libpconn/PConnection_usb.c	Thu Jul  1 01:56:57 2004
-@@ -41,6 +41,10 @@
- #  include <libintl.h>		/* For i18n */
- #endif	/* HAVE_LIBINTL_H */
- 
-+#if !HAVE_USLEEP
-+int usleep(unsigned int usec);	/* defined in PConnection_serial.c */
-+#endif
-+
- #include "pconn/PConnection.h"
- #include "palm.h"
- #include "pconn/palm_errno.h"
-@@ -439,7 +443,7 @@
- 	 *  you'll get an ENXIO until the device has been inserted
- 	 *  on the USB bus.
- 	 */
--	for (i = 0; i < 30; i++) {
-+	for (i = 0; i < 30 * (1000000 / 50000); i++) {
- 		if ((usb_ep0 = open(device, O_RDWR | O_BINARY)) >= 0) 
- 				/* The O_BINARY flag is rather bogus, since
- 				 * the only relevant platform that uses it
-@@ -465,7 +469,7 @@
- 			 */
- 			break;
- 		}
--		sleep(1);
-+		usleep(50000);
- 	}
- 
- 	/*
-@@ -711,7 +715,7 @@
- 			    ((flags & PCONNFL_TRANSIENT) != 0))
- 			{
- 				/* Ignore this error and try again */
--				sleep(1);
-+				usleep(10000);
- 				continue;
- 			}
- 
diff --git a/palm/coldsync/files/patch-noperl b/palm/coldsync/files/patch-noperl
deleted file mode 100644
index b26d7a3666e1..000000000000
--- a/palm/coldsync/files/patch-noperl
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile	Mon Jun  4 06:18:28 2001
-+++ Makefile	Fri Dec 27 09:31:00 2002
-@@ -16,3 +16,3 @@
- # Note that $(PERLDIR) is expanded in Make.rules.
--SUBDIRS =	include libpconn libpdb src $(PERLDIR) conduits doc i18n
-+SUBDIRS =	include libpconn libpdb src $(PERLDIRS) doc i18n
- 
---- Make.rules.in	Mon Nov 19 12:05:33 2001
-+++ Make.rules.in	Fri Dec 27 09:30:15 2002
-@@ -40,3 +40,3 @@
- # Subdirectory containing the Perl modules. Used by "configure --without-perl"
--PERLDIR =	@PERLDIR@
-+PERLDIRS =	@PERLDIRS@
- 
---- configure	Fri Dec  7 10:24:39 2001
-+++ configure	Fri Dec 27 09:29:28 2002
-@@ -3939,5 +3939,5 @@
- 	# Name of Perl subdirectory
--	PERLDIR=perl
-+	PERLDIRS="perl conduits"
- else
--	PERLDIR=""
-+	PERLDIRS=""
- fi
-@@ -4303,3 +4303,3 @@
- s%@LIBYACC@%$LIBYACC%g
--s%@PERLDIR@%$PERLDIR%g
-+s%@PERLDIRS@%$PERLDIRS%g
- s%@CONDUITDIR@%$CONDUITDIR%g
diff --git a/palm/coldsync/files/patch-parser.y b/palm/coldsync/files/patch-parser.y
deleted file mode 100644
index 1ebfd0fe8670..000000000000
--- a/palm/coldsync/files/patch-parser.y
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/parser.y~	Tue Feb 20 06:04:15 2001
-+++ src/parser.y	Mon Dec  2 18:32:28 2002
-@@ -1003,6 +1003,7 @@
- 	{
- 		$$ = NULL;
- 	}
-+	;
- 
-  /* XXX - Added in 1.1.10, Sat May 20 14:21:43 2000. Make the colon
-   * mandatory at some point.
-@@ -1028,6 +1029,7 @@
- 		ANOTHER_ERROR;
- 		Error(_("\tMissing ':'."));
- 	}
-+	;
- 
- 
- open_brace:	'{'
-@@ -1036,6 +1038,7 @@
- 		ANOTHER_ERROR;
- 		Error(_("\tMissing '{'."));
- 	}
-+	;
- 
- semicolon:	';'
- 	| error
-@@ -1043,6 +1046,7 @@
- 		ANOTHER_ERROR;
- 		Error(_("\tMissing ';'."));
- 	}
-+	;
- 
- %%
- 
diff --git a/palm/coldsync/files/patch-shlib b/palm/coldsync/files/patch-shlib
deleted file mode 100644
index b6d1c0564f5c..000000000000
--- a/palm/coldsync/files/patch-shlib
+++ /dev/null
@@ -1,29 +0,0 @@
---- libpconn/Makefile	Mon Nov 19 12:07:15 2001
-+++ libpconn/Makefile	Fri Dec 27 16:40:20 2002
-@@ -43,3 +43,7 @@
- 
--all::	${LIBRARY}
-+all::	${LIBRARY} ${SHLIB}
-+
-+install:: ${LIBRARY} ${SHLIB}
-+	${INSTALL_DATA} ${LIBRARY} ${SHLIBVER} ${PREFIX}/lib
-+	ln -sf ${SHLIBVER} ${PREFIX}/lib/${SHLIB}
- 
---- libpdb/Makefile	Sun Nov 11 23:31:25 2001
-+++ libpdb/Makefile	Fri Dec 27 16:41:06 2002
-@@ -27,3 +27,7 @@
- 
--all::	${LIBRARY}
-+all::	${LIBRARY} ${SHLIB}
-+
-+install:: ${LIBRARY} ${SHLIB}
-+	${INSTALL_DATA} ${LIBRARY} ${SHLIBVER} ${PREFIX}/lib
-+	ln -sf ${SHLIBVER} ${PREFIX}/lib/${SHLIB}
- 
---- Make.rules.in	Mon Nov 19 12:05:33 2001
-+++ Make.rules.in	Fri Dec 27 16:58:41 2002
-@@ -142,3 +142,3 @@
- SHLIB =		lib${LIBNAME}.so
--SHLIBVER =	lib${LIBNAME}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-+SHLIBVER =	lib${LIBNAME}.so.${SHLIB_MAJOR}
- 
diff --git a/palm/coldsync/files/patch-src_symboltable.cc b/palm/coldsync/files/patch-src_symboltable.cc
deleted file mode 100644
index f39b7b198263..000000000000
--- a/palm/coldsync/files/patch-src_symboltable.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/symboltable.cc.orig	Tue Nov 13 16:48:07 2001
-+++ src/symboltable.cc	Tue May 11 11:19:40 2004
-@@ -7,11 +7,15 @@
-  * $Id: symboltable.cc,v 2.2 2001/10/18 01:38:55 arensb Exp $
-  */
- 
-+#include <stdio.h>
-+#include <wchar.h>
- #include "config.h"
- #include <string>
- #include <map>
- #include <cstdlib>		// For malloc() and friends
- #include "symboltable.h"
-+
-+using namespace std;
- 
- static char *make_c_string(const string &s);
- 
diff --git a/palm/coldsync/pkg-descr b/palm/coldsync/pkg-descr
deleted file mode 100644
index c4204630a8f1..000000000000
--- a/palm/coldsync/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-	ColdSync is a robust, extensible, portable tool for
-synchronizing PalmOS devices (PalmPilot et al.) with a Unix
-workstation. It also supports USB connections, under FreeBSD 4.0
-and higher.
-	It runs without a GUI, and therefore allows you to sync
-without running X.
-	ColdSync is extensible through the use of conduits, which
-allow it to share information with other applications.
-
-WWW: http://www.coldsync.org/
diff --git a/palm/coldsync/pkg-plist b/palm/coldsync/pkg-plist
deleted file mode 100644
index 6edb83d7048d..000000000000
--- a/palm/coldsync/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-bin/coldsync
-etc/sample.coldsync.rc
-lib/libpconn.a
-lib/libpconn.so
-lib/libpconn.so.0
-lib/libpdb.a
-lib/libpdb.so
-lib/libpdb.so.0
-%%NLS%%share/locale/cs/LC_MESSAGES/coldsync.mo
-%%NLS%%share/locale/de/LC_MESSAGES/coldsync.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/coldsync.mo
-%%NLS%%share/locale/it/LC_MESSAGES/coldsync.mo
-include/palm.h
-include/pdb.h
-include/pconn/PConnection.h
-include/pconn/cmp.h
-include/pconn/dlp.h
-include/pconn/dlp_cmd.h
-include/pconn/dlp_rpc.h
-include/pconn/netsync.h
-include/pconn/padp.h
-include/pconn/palm_errno.h
-include/pconn/palm_types.h
-include/pconn/pconn.h
-include/pconn/slp.h
-include/pconn/spc_client.h
-include/pconn/util.h
-@dirrm include/pconn