19 files changed, 3 insertions, 350 deletions

diff --git a/MOVED b/MOVED
index 342940ede262..3e1e3815af5b 100644
--- a/MOVED
+++ b/MOVED
@@ -5710,3 +5710,6 @@ net/ipa_ip6fw||2014-03-14|Has expired: Depends on IPv6 ipfw firewall
 palm/synce-hal||2014-03-14|Has expired: Requires pppd
 net/pppoa||2014-03-14|Has expired: Broken on FreeBSD 8 and later since june 2009
 multimedia/linux-huludesktop||2014-03-14|Removed
+multimedia/linux_v4l2wrapper-kmod||2014-03-16|Has expired: Included now in all supported FreeBSD versions
+devel/sgl||2014-03-16|Has expired: S/W never progressed beyond incomplete graduate project; library was never properly built - not worth fixing
+palm/jpilot-db||2014-03-16|Has expired
diff --git a/devel/Makefile b/devel/Makefile
index 53231b49e384..0bc361b075db 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4437,7 +4437,6 @@
     SUBDIR += sfslite-dbg
     SUBDIR += sfslite-noopt
     SUBDIR += sgb
-    SUBDIR += sgl
     SUBDIR += shapelib
     SUBDIR += shflags
     SUBDIR += shiboken
diff --git a/devel/sgl/Makefile b/devel/sgl/Makefile
deleted file mode 100644
index 8308c266ae2b..000000000000
--- a/devel/sgl/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Created by: David Holm <david@realityrift.com>
-# $FreeBSD$
-
-PORTNAME=	sgl
-PORTVERSION=	2.0a3
-CATEGORIES=	devel
-MASTER_SITES=	http://www1.cs.columbia.edu/dcc/nestor/presentations/SGL/ \
-		ftp://ftp.cs.rpi.edu/pub/stl/
-DISTNAME=	SGL-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	STL implementation for ADA95
-
-DEPRECATED=	S/W never progressed beyond incomplete graduate project; library was never properly built - not worth fixing
-EXPIRATION_DATE=20140315
-
-NO_BUILD=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-do-install:
-	${MKDIR} ${PREFIX}/lib/SGL
-	${MKDIR} ${PREFIX}/share/SGL
-	${MKDIR} ${PREFIX}/share/SGL/examples
-
-	for i in `cat pkg-plist|grep -v dirrm|grep "lib/SGL"|sed "s/lib\/SGL\///"`; do \
-			${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sgl/$${i} ${PREFIX}/lib/SGL; \
-	done
-
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/copyright ${PREFIX}/share/SGL
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/readme ${PREFIX}/share/SGL
-
-	for i in `cat pkg-plist|grep -v dirrm|grep "share/SGL/examples"|sed "s/share\/SGL\/examples\///"`; do \
-			${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/test/$${i} ${PREFIX}/share/SGL/examples; \
-	done
-
-post-install:
-	@${ECHO}
-	@${ECHO} "Files have been installed into ${PREFIX}/lib/SGL"
-	@${ECHO}
-
-.include <bsd.port.post.mk>
diff --git a/devel/sgl/distinfo b/devel/sgl/distinfo
deleted file mode 100644
index aa9525b046ce..000000000000
--- a/devel/sgl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (SGL-2.0a3.tar.gz) = fca004ee11b0e205557be97a7f574a33f81538a55ef75a8fd5d290913eea8172
-SIZE (SGL-2.0a3.tar.gz) = 59095
diff --git a/devel/sgl/files/patch-makefile b/devel/sgl/files/patch-makefile
deleted file mode 100644
index efba499f3068..000000000000
--- a/devel/sgl/files/patch-makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- test/makefile.orig	Wed Aug 19 03:59:46 1998
-+++ test/makefile	Fri Dec 20 22:03:12 2002
-@@ -11,7 +11,7 @@
- # 
- 
- GNATMAKE=gnatmake
--ADA_INCLUDE=-I../SGL
-+ADA_INCLUDE=-I/usr/local/lib/SGL
- # Debuging flags :-v -gnatv -gnatf #-gnatdc
- GFLAGS_OPT=-O3 -gnatn
- #GFLAGS=-g
-@@ -57,6 +57,6 @@
- 	./test_iterators
- 
- clean: dummy
--	rm -f *.ali *.o *~ b_*.c test_vectors.exe test_lists.exe test_trees.exe test_sets.exe test_maps.exe test_stacks.exe test_queues.exe test_algorithms.exe test_container_signatures.exe test_functions.exe test_iterators.exe benchmark.exe
-+	rm -f *.ali *.o *~ *.log b_*.c b~* test_vectors test_lists test_trees test_sets test_maps test_stacks test_queues test_algorithms test_container_signatures test_functions test_iterators benchmark
- 
- dummy:
diff --git a/devel/sgl/pkg-descr b/devel/sgl/pkg-descr
deleted file mode 100644
index d42b4fb52e0b..000000000000
--- a/devel/sgl/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-The Ada "Standard Generic Library" (SGL)
-The Ada SGL is a port of the C++ Standard Template Library (STL).
diff --git a/devel/sgl/pkg-plist b/devel/sgl/pkg-plist
deleted file mode 100644
index 84fbf4d14472..000000000000
--- a/devel/sgl/pkg-plist
+++ /dev/null
@@ -1,119 +0,0 @@
-lib/SGL/header
-lib/SGL/sgl-algorithms.adb
-lib/SGL/sgl-algorithms.ads
-lib/SGL/sgl-back_insertion_sequence_containers.ads
-lib/SGL/sgl-basic_algorithms.adb
-lib/SGL/sgl-basic_algorithms.ads
-lib/SGL/sgl-bidirectional_constant_iterators.ads
-lib/SGL/sgl-bidirectional_iterators.ads
-lib/SGL/sgl-containers.ads
-lib/SGL/sgl-controlled_stubs.adb
-lib/SGL/sgl-controlled_stubs.ads
-lib/SGL/sgl-default_allocators.adb
-lib/SGL/sgl-default_allocators.ads
-lib/SGL/sgl-forward_constant_iterators.ads
-lib/SGL/sgl-forward_containers.ads
-lib/SGL/sgl-forward_iterators.ads
-lib/SGL/sgl-front_insertion_sequence_containers.ads
-lib/SGL/sgl-function_adaptors.adb
-lib/SGL/sgl-function_adaptors.ads
-lib/SGL/sgl-input_iterators.ads
-lib/SGL/sgl-integer_operations.ads
-lib/SGL/sgl-iterator_adaptors.adb
-lib/SGL/sgl-iterator_adaptors.ads
-lib/SGL/sgl-iterator_tags.adb
-lib/SGL/sgl-iterator_tags.ads
-lib/SGL/sgl-list_signatures.ads
-lib/SGL/sgl-lists.adb
-lib/SGL/sgl-lists.ads
-lib/SGL/sgl-lists.cp
-lib/SGL/sgl-map_signatures.ads
-lib/SGL/sgl-maps.adb
-lib/SGL/sgl-maps.ads
-lib/SGL/sgl-ostream_iterators.adb
-lib/SGL/sgl-ostream_iterators.ads
-lib/SGL/sgl-output_iterators.ads
-lib/SGL/sgl-pairs.adb
-lib/SGL/sgl-pairs.ads
-lib/SGL/sgl-priority_queues.adb
-lib/SGL/sgl-priority_queues.ads
-lib/SGL/sgl-private_stubs.adb
-lib/SGL/sgl-private_stubs.ads
-lib/SGL/sgl-queues.adb
-lib/SGL/sgl-queues.ads
-lib/SGL/sgl-random_access_constant_iterators.ads
-lib/SGL/sgl-random_access_containers.ads
-lib/SGL/sgl-random_access_iterators.ads
-lib/SGL/sgl-reverse_bidirectional_constant_iterators.adb
-lib/SGL/sgl-reverse_bidirectional_constant_iterators.ads
-lib/SGL/sgl-reverse_bidirectional_iterators.adb
-lib/SGL/sgl-reverse_bidirectional_iterators.ads
-lib/SGL/sgl-reverse_constant_iterator_operations.adb
-lib/SGL/sgl-reverse_constant_iterator_operations.ads
-lib/SGL/sgl-reverse_iterator_operations.adb
-lib/SGL/sgl-reverse_iterator_operations.ads
-lib/SGL/sgl-reverse_random_access_constant_iterators.adb
-lib/SGL/sgl-reverse_random_access_constant_iterators.ads
-lib/SGL/sgl-reverse_random_access_iterators.adb
-lib/SGL/sgl-reverse_random_access_iterators.ads
-lib/SGL/sgl-reversible_containers.ads
-lib/SGL/sgl-sequence_containers.ads
-lib/SGL/sgl-set_signatures.ads
-lib/SGL/sgl-sets.adb
-lib/SGL/sgl-sets.ads
-lib/SGL/sgl-special_pairs-extension.adb
-lib/SGL/sgl-special_pairs-extension.ads
-lib/SGL/sgl-special_pairs.adb
-lib/SGL/sgl-special_pairs.ads
-lib/SGL/sgl-stacks.adb
-lib/SGL/sgl-stacks.ads
-lib/SGL/sgl-trees.adb
-lib/SGL/sgl-trees.ads
-lib/SGL/sgl-vector_signatures.ads
-lib/SGL/sgl-vectors.adb
-lib/SGL/sgl-vectors.ads
-lib/SGL/sgl.ads
-share/SGL/copyright
-share/SGL/readme
-share/SGL/examples/benchmark.adb
-share/SGL/examples/bitest.adb
-share/SGL/examples/integer_ostream_iterators.adb
-share/SGL/examples/test_algorithms.adb
-share/SGL/examples/test_assert.adb
-share/SGL/examples/test_container_signatures.adb
-share/SGL/examples/test_functions.adb
-share/SGL/examples/test_iterators.adb
-share/SGL/examples/test_lists.adb
-share/SGL/examples/test_maps.adb
-share/SGL/examples/test_queues.adb
-share/SGL/examples/test_sets.adb
-share/SGL/examples/test_stacks.adb
-share/SGL/examples/test_trees.adb
-share/SGL/examples/test_vectors.adb
-share/SGL/examples/bool_private.ads
-share/SGL/examples/bool_random.ads
-share/SGL/examples/boolean_controlled.ads
-share/SGL/examples/int_bool_map_signatures.ads
-share/SGL/examples/int_bool_maps.ads
-share/SGL/examples/int_bool_multimaps.ads
-share/SGL/examples/int_controlled.ads
-share/SGL/examples/int_identity.ads
-share/SGL/examples/int_list_containers.ads
-share/SGL/examples/int_list_queues.ads
-share/SGL/examples/int_list_signatures.ads
-share/SGL/examples/int_lists.ads
-share/SGL/examples/int_private.ads
-share/SGL/examples/int_random.ads
-share/SGL/examples/int_set_signatures.ads
-share/SGL/examples/int_sets.ads
-share/SGL/examples/int_trees.ads
-share/SGL/examples/int_vector_containers.ads
-share/SGL/examples/int_vector_signatures.ads
-share/SGL/examples/int_vector_stacks.ads
-share/SGL/examples/int_vectors.ads
-share/SGL/examples/integer_ostream_iterators.ads
-share/SGL/examples/test_assert.ads
-share/SGL/examples/makefile
-@dirrm lib/SGL
-@dirrm share/SGL/examples
-@dirrm share/SGL
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 9948a169e87a..f5744166dd9a 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -195,7 +195,6 @@
     SUBDIR += linux-tsmuxer
     SUBDIR += linux-xmovie
     SUBDIR += linux_dvbwrapper-kmod
-    SUBDIR += linux_v4l2wrapper-kmod
     SUBDIR += lives
     SUBDIR += livestreamer
     SUBDIR += lsdvd
diff --git a/multimedia/linux_v4l2wrapper-kmod/Makefile b/multimedia/linux_v4l2wrapper-kmod/Makefile
deleted file mode 100644
index e8b759e572e2..000000000000
--- a/multimedia/linux_v4l2wrapper-kmod/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: nox@FreeBSD.org
-# $FreeBSD$
-
-PORTNAME=	linux_v4l2wrapper-kmod
-PORTVERSION=	1.0
-PORTREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	LOCAL/nox \
-		http://people.freebsd.org/~ae/
-DISTNAME=	linux_v4l2_kld
-
-MAINTAINER=	nox@FreeBSD.org
-COMMENT=	Linux compatibility layer - V4L2 ioctl handler
-
-ONLY_FOR_ARCHS=	i386 amd64
-PATCH_STRIP=	-p1
-WRKSRC=		${WRKDIR}/linux_v4l2
-
-# Remember to remove references to Makefile.sub in other ports...
-DEPRECATED=	Included now in all supported FreeBSD versions
-EXPIRATION_DATE=	2014-03-15
-
-USES=		kmod tar:tgz
-
-.include <bsd.port.pre.mk>
-
-PLIST_FILES+=	"@cwd /"
-PLIST_FILES+=	${KMODDIR:C,^/,,}/linux_v4l2wrapper.ko
-
-CFLAGS+=	${DEBUG_FLAGS}
-
-.include "${.CURDIR}/Makefile.sub"
-
-.if ${LINUX_V4L2_AVAILABLE} == "1"
-IGNORE=		is already in kernel
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/multimedia/linux_v4l2wrapper-kmod/Makefile.sub b/multimedia/linux_v4l2wrapper-kmod/Makefile.sub
deleted file mode 100644
index e6f16d7c758d..000000000000
--- a/multimedia/linux_v4l2wrapper-kmod/Makefile.sub
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-# try to avoid child processes when finding out if already in the kernel
-.if ${OSVERSION} > 900036 || (${OSVERSION} < 900000 && ${OSVERSION} > 802508)
-LINUX_V4L2_AVAILABLE=	1
-.else
-.if ${OSVERSION} == 900036 || ${OSVERSION} == 802508
-LINUX_V4L2_AVAILABLE!=	($(SYSCTL) -n kern.features.linuxulator_v4l2 2>/dev/null || true)
-.else
-LINUX_V4L2_AVAILABLE=	0
-.endif
-.endif
diff --git a/multimedia/linux_v4l2wrapper-kmod/distinfo b/multimedia/linux_v4l2wrapper-kmod/distinfo
deleted file mode 100644
index 0f5857863ba1..000000000000
--- a/multimedia/linux_v4l2wrapper-kmod/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (linux_v4l2_kld.tgz) = 1d8d4fad58bc829f85541d41d5e29425e1453375d6b25848c20eea677119ee32
-SIZE (linux_v4l2_kld.tgz) = 22170
diff --git a/multimedia/linux_v4l2wrapper-kmod/files/patch-Makefile b/multimedia/linux_v4l2wrapper-kmod/files/patch-Makefile
deleted file mode 100644
index 85ed11c8a222..000000000000
--- a/multimedia/linux_v4l2wrapper-kmod/files/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,11 +1,11 @@
- # $FreeBSD$
- 
--.if ${MACHINE_CPUARCH} == "amd64"
-+.if ${MACHINE_ARCH} == "amd64"
- SFX= 32
- CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32
- .endif
- 
--KMOD=	linux_v4l2
-+KMOD=	linux_v4l2wrapper
- SRCS=	linux_v4l2.c
- 
- .include <bsd.kmod.mk>
diff --git a/multimedia/linux_v4l2wrapper-kmod/files/patch-linux_v4l2.c b/multimedia/linux_v4l2wrapper-kmod/files/patch-linux_v4l2.c
deleted file mode 100644
index fc0ca6cd29d9..000000000000
--- a/multimedia/linux_v4l2wrapper-kmod/files/patch-linux_v4l2.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/linux_v4l2.c
-+++ b/linux_v4l2.c
-@@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$");
- #endif
- 
- #include <compat/linux/linux_ioctl.h>
--#include <compat/linux/linux_videodev.h>
--#include <compat/linux/linux_videodev_compat.h>
- 
- #include "linux_v4l2_ioctl.h"
- #include "linux_videodev2.h"
-@@ -71,14 +69,14 @@ linux_v4l2_modevent(module_t mod __unuse
- }
- 
- static moduledata_t v4l2_mod = {
--	"linux_v4l2",
-+	"linux_v4l2wrapper",
- 	linux_v4l2_modevent,
- 	0
- };
- 
--DECLARE_MODULE(linux_v4l2, v4l2_mod, SI_SUB_SYSCALLS, SI_ORDER_ANY);
--MODULE_VERSION(linux_v4l2, 1);
--MODULE_DEPEND(linux_v4l2, linux, 1, 1, 1);
-+DECLARE_MODULE(linux_v4l2wrapper, v4l2_mod, SI_SUB_SYSCALLS, SI_ORDER_ANY);
-+MODULE_VERSION(linux_v4l2wrapper, 1);
-+MODULE_DEPEND(linux_v4l2wrapper, linux, 1, 1, 1);
- 
- static int
- linux_to_bsd_v4l2_standard(struct l_v4l2_standard *lvstd, struct v4l2_standard *vstd)
diff --git a/multimedia/linux_v4l2wrapper-kmod/pkg-descr b/multimedia/linux_v4l2wrapper-kmod/pkg-descr
deleted file mode 100644
index 68ee1fe20dea..000000000000
--- a/multimedia/linux_v4l2wrapper-kmod/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This kld adds V4L2 ioctl handling to the Linux compatibility layer
-so that Linux apps like Skype or Flash can talk to V4L2 devices
-(like webcams) via /dev/videoX.  The patches this kld is based on
-have been committed to FreeBSD 9.0-current (r221426) and 8.2-stable
-(r222914) so this port is only needed on eaerlier versions.
-
-Note this port does not contain actual V4L2 drivers, those are
-provided by e.g. the multimedia/webcamd port.
-
-WWW: http://people.freebsd.org/~nox/dvb/
diff --git a/palm/Makefile b/palm/Makefile
index caf77b4beea3..16976d31cebe 100644
--- a/palm/Makefile
+++ b/palm/Makefile
@@ -9,7 +9,6 @@
     SUBDIR += iSiloXC
     SUBDIR += imgvtopgm
     SUBDIR += jpilot
-    SUBDIR += jpilot-db
     SUBDIR += jpilot-picsnvideos
     SUBDIR += libmal
     SUBDIR += makeztxt
diff --git a/palm/jpilot-db/Makefile b/palm/jpilot-db/Makefile
deleted file mode 100644
index d993773d15c3..000000000000
--- a/palm/jpilot-db/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: ijliao
-# $FreeBSD$
-
-PORTNAME=	jpilot-db
-PORTVERSION=	1.3.20
-PORTREVISION=	2
-CATEGORIES=	palm java
-MASTER_SITES=	http://chickenshick.com/jpilot-db/download/
-EXTRACT_SUFX=	-ej.jar
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Desktop app for pilot-db
-
-BROKEN=		Distfile is unfetchable after MASTER_SITES reorganization
-EXPIRATION_DATE=2014-03-15
-
-NO_WRKSUBDIR=	yes
-EXTRACT_CMD=	${CP}
-EXTRACT_BEFORE_ARGS=	# empty
-EXTRACT_AFTER_ARGS=	.
-USE_JAVA=	yes
-JAVA_VERSION=	1.6+
-NO_BUILD=	yes
-SUB_FILES=	jpilot-db.sh
-SUB_LIST=	PKGNAME=${PKGNAME}
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/jpilot-db \
-		%%DATADIR%%/${PKGNAME}.jar
-PLIST_DIRS=	%%DATADIR%%
-
-NO_STAGE=	yes
-do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/jpilot-db.sh ${PREFIX}/bin/jpilot-db
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/${DISTFILES} ${DATADIR}/${PKGNAME}.jar
-
-.include <bsd.port.mk>
diff --git a/palm/jpilot-db/distinfo b/palm/jpilot-db/distinfo
deleted file mode 100644
index 9b0c2ddae52a..000000000000
--- a/palm/jpilot-db/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (jpilot-db-1.3.20-ej.jar) = c041a03dbb05e936844442b626a9f017532440ad5c6727b7e5348d9c83ddee0f
-SIZE (jpilot-db-1.3.20-ej.jar) = 4254301
diff --git a/palm/jpilot-db/files/jpilot-db.sh.in b/palm/jpilot-db/files/jpilot-db.sh.in
deleted file mode 100644
index 12fe8a8b942e..000000000000
--- a/palm/jpilot-db/files/jpilot-db.sh.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/%%PKGNAME%%.jar"
diff --git a/palm/jpilot-db/pkg-descr b/palm/jpilot-db/pkg-descr
deleted file mode 100644
index cccc08a3ee5a..000000000000
--- a/palm/jpilot-db/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-JPilot-DB is a sister project of pilot-db. JPilot-DB provides a desktop
-application for creating and editing database files that can be read on the
-Palm with pilot-db. Together, these two applications provide a complete
-desktop <-> palm solutions for your database needs.
-
-pilot-db web site: http://pilot-db.sourceforge.net/
-
-WWW: http://www.chickenshick.com/jpilot-db/