audio/mp3butler Depends on audio/p5-MusicBrainz-Client which is DEPRECATED

audio/p5-MusicBrainz-Client Disappeared from CPAN editors/doxymacs Depends on www/w3-4, which is DEPRECATED graphics/libart Does not fetch, no more public distfiles java/jboss4 Does not build with new ant korean/hanterm Depends on korean/johabfonts, which is DEPRECATED, fails to build with new utmpx korean/johabfonts No more public distfiles, installs into / korean/hlatex-psfonts-uhc-extra Depends on korean/hlatex, which is DEPRECATED korean/texinfo Depends on korean/hlatex, which is DEPRECATED korean/hlatex No more public distfiles mail/jboss-mailservices Depends on java/jboss4, which is DEPRECATED misc/p5-Geography-NationalGrid-TW Depends on misc/p5-Geography-NationalGrid, which is DEPRECATED misc/p5-Geography-NationalGrid Disappeared from CPAN multimedia/fxtv Depends on multimedia/mplex, which is DEPRECATED multimedia/mplex Upstream disapeared and distfile is not available net/py-timeoutsocket Upstream disapear and distfile is no more available textproc/p5-XML-LibRSVG Unmaintained and not used anymore textproc/javacc No more public distfiles www/w3-4/Makefile Upstream disapeared and distfile is not available www/commonist Depends on textproc/javacc, which is DEPRECATED www/newsfeed Depends on net/py-timeoutsocket, which is DEPRECATED x11/fbsd-icons Upstream disapear and distfile is no more available x11-themes/geramik Depends on x11-toolkits/qtpixmap, which is DEPRECATED x11-toolkits/qtpixmap No more public distfiles x11-wm/fvwm95-i18n Depends on x11/fbsd-icons, which is DEPRECATED x11-wm/fvwm95 Depends on x11/fbsd-icons, which is DEPRECATED
svn path=/head/; revision=284820
2011-11-01 04:34:28 +00:00 · 2011-11-01 04:34:28 +00:00 · 2555968c05 · 2021-03-31 03:12:20 +00:00
commit 2555968c05
parent 61b1548a17
179 changed files with 26 additions and 14725 deletions
--- a/26
+++ b/26
@ -2842,3 +2842,29 @@ devel/py-vmaps||2011-10-27|Has expired: Author recommends using math/py-numpy in
 devel/rubygem-rack-protection||2011-10-28|Removed
 graphics/tumbler|deskutils/xfce4-tumbler|2011-10-29|Duplicate
 graphics/poppler-gtk|graphics/poppler-glib|2011-10-31|Move to match library name
+audio/mp3butler||2011-10-31|Depends on audio/p5-MusicBrainz-Client which is DEPRECATED
+audio/p5-MusicBrainz-Client||2011-10-31|Disappeared from CPAN
+editors/doxymacs||2011-10-31|Depends on www/w3-4, which is DEPRECATED
+graphics/libart||2011-10-31|Does not fetch, no more public distfiles
+java/jboss4||2011-10-31|Does not build with new ant
+korean/hanterm||2011-10-31|Depends on korean/johabfonts, which is DEPRECATED, fails to build with new utmpx
+korean/johabfonts||2011-10-31|No more public distfiles, installs into /
+korean/hlatex-psfonts-uhc-extra||2011-10-31|Depends on korean/hlatex, which is DEPRECATED
+korean/texinfo||2011-10-31|Depends on korean/hlatex, which is DEPRECATED
+korean/hlatex||2011-10-31|No more public distfiles
+mail/jboss-mailservices||2011-10-31|Depends on java/jboss4, which is DEPRECATED
+misc/p5-Geography-NationalGrid-TW||2011-10-31|Depends on misc/p5-Geography-NationalGrid, which is DEPRECATED
+misc/p5-Geography-NationalGrid||2011-10-31|Disappeared from CPAN
+multimedia/fxtv||2011-10-31|Depends on multimedia/mplex, which is DEPRECATED
+multimedia/mplex||2011-10-31|Upstream disapeared and distfile is not available
+net/py-timeoutsocket||2011-10-31|Upstream disapear and distfile is no more available
+textproc/p5-XML-LibRSVG||2011-10-31|Unmaintained and not used anymore
+textproc/javacc||2011-10-31|No more public distfiles
+www/w3-4/Makefile||2011-10-31|Upstream disapeared and distfile is not available
+www/commonist||2011-10-31|Depends on textproc/javacc, which is DEPRECATED
+www/newsfeed||2011-10-31|Depends on net/py-timeoutsocket, which is DEPRECATED
+x11/fbsd-icons||2011-10-31|Upstream disapear and distfile is no more available
+x11-themes/geramik||2011-10-31|Depends on x11-toolkits/qtpixmap, which is DEPRECATED
+x11-toolkits/qtpixmap||2011-10-31|No more public distfiles
+x11-wm/fvwm95-i18n||2011-10-31|Depends on x11/fbsd-icons, which is DEPRECATED
+x11-wm/fvwm95||2011-10-31|Depends on x11/fbsd-icons, which is DEPRECATED
--- a/audio/Makefile
+++ b/audio/Makefile
@ -469,7 +469,6 @@
    SUBDIR += mp3asm
    SUBDIR += mp3blaster
    SUBDIR += mp3burn
-    SUBDIR += mp3butler
    SUBDIR += mp3c
    SUBDIR += mp3check
    SUBDIR += mp3ck
@ -553,7 +552,6 @@
    SUBDIR += p5-MPEG-ID3v2Tag
    SUBDIR += p5-Music-Audioscrobbler-MPD
    SUBDIR += p5-Music-Audioscrobbler-Submit
-    SUBDIR += p5-MusicBrainz-Client
    SUBDIR += p5-MusicBrainz-DiscID
    SUBDIR += p5-MusicBrainz-Queries
    SUBDIR += p5-Net-DAAP-Client
--- a/audio/mp3butler/Makefile
+++ b/audio/mp3butler/Makefile
@ -1,33 +0,0 @@
-# New ports collection makefile for:   mp3butler
-# Date created:        30 April 2001
-# Whom:                Christopher Preston <rbg@gayteenresource.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mp3butler
-PORTVERSION=	2.40
-CATEGORIES=	audio
-MASTER_SITES=	http://iainlea.dyndns.org/software/${PORTNAME}/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A program for renaming mp3 files and looking ID3 tags for it
-
-DEPRECATED=	Depends on audio/p5-MusicBrainz-Client which is DEPRECATED
-EXPIRATION_DATE=	2011-10-31
-
-RUN_DEPENDS=	${SITE_PERL}/CDDB.pm:${PORTSDIR}/audio/p5-CDDB \
-		${SITE_PERL}/MP3/Tag.pm:${PORTSDIR}/audio/p5-MP3-Tag \
-	${SITE_PERL}/${PERL_ARCH}/MusicBrainz/Client.pm:${PORTSDIR}/audio/p5-MusicBrainz-Client
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-USE_PERL5=	yes
-
-PLIST_FILES=	bin/mp3butler.pl bin/id3butler.pl
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mp3butler.pl ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/id3butler.pl ${PREFIX}/bin
-
-.include <bsd.port.mk>
--- a/audio/mp3butler/distinfo
+++ b/audio/mp3butler/distinfo
@ -1,2 +0,0 @@
-SHA256 (mp3butler-2.40.tar.gz) = 7337ed71c4357ab3ec179bc21909d48e007e74b8da577c2971a243d486f3c3ff
-SIZE (mp3butler-2.40.tar.gz) = 13688
--- a/audio/mp3butler/pkg-descr
+++ b/audio/mp3butler/pkg-descr
@ -1,7 +0,0 @@
-Mp3butler is a set of programs written in perl for renaming your mp3's.
-
-o It will remove all characters that require shell escapes from filenames
-o It will remove capitalization from filenames
-o It can create ID3 tags using the filename
-o It can reorganize your mp3's into an organizational hierarchy 
-o id3butler can also lookup tags for mp3 via MusicBrainz and FreeDB databases
--- a/audio/p5-MusicBrainz-Client/Makefile
+++ b/audio/p5-MusicBrainz-Client/Makefile
@ -1,36 +0,0 @@
-# New ports collection makefile for:	p5-MusicBrainz-Client
-# Date created:		23 March 2003
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	MusicBrainz-Client
-PORTVERSION=	0.11
-CATEGORIES=	audio perl5
-MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	A Perl module that provides access to the musicbrainz client API
-
-# Depended on by audio/mp3butler
-DEPRECATED=	Disappeared from CPAN
-EXPIRATION_DATE=	2011-10-31
-
-LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MusicBrainz/Queries.pm:${PORTSDIR}/audio/p5-MusicBrainz-Queries
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		MusicBrainz::Client.3 \
-		MusicBrainz::Client::Simple.3 \
-		MusicBrainz::Client::Simple::Album.3 \
-		MusicBrainz::Client::Simple::Artist.3 \
-		MusicBrainz::Client::Simple::Track.3
-
-pre-configure:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile.PL
-
-.include <bsd.port.mk>
--- a/audio/p5-MusicBrainz-Client/distinfo
+++ b/audio/p5-MusicBrainz-Client/distinfo
@ -1,2 +0,0 @@
-SHA256 (MusicBrainz-Client-0.11.tar.gz) = 6ee92c82e279381ea19139f5f0258bef705fedc156dbc86be2bb45f4994646ce
-SIZE (MusicBrainz-Client-0.11.tar.gz) = 23300
--- a/audio/p5-MusicBrainz-Client/pkg-descr
+++ b/audio/p5-MusicBrainz-Client/pkg-descr
@ -1,4 +0,0 @@
-This module provides access to the musicbrainz client API using a
-perl-ish OO interface.
-
-WWW: http://www.musicbrainz.org/
--- a/audio/p5-MusicBrainz-Client/pkg-plist
+++ b/audio/p5-MusicBrainz-Client/pkg-plist
@ -1,15 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/simple_demo.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client/Simple.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client/Simple/Album.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client/Simple/Artist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client/Simple/Track.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Client/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Client/Client.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Client/Client.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Client/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz
--- a/editors/Makefile
+++ b/editors/Makefile
@ -31,7 +31,6 @@
    SUBDIR += dhex
    SUBDIR += diakonos
    SUBDIR += dkns
-    SUBDIR += doxymacs
    SUBDIR += drjava
    SUBDIR += e3
    SUBDIR += e93
--- a/editors/doxymacs/Makefile
+++ b/editors/doxymacs/Makefile
@ -1,29 +0,0 @@
-# Ports collection makefile for:	w3 on Emacs21
-# Date created:				21 December 2003
-# Whom:					Dryice Liu <dryice@liu.com.cn>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	doxymacs
-PORTVERSION=	1.8.0
-PORTREVISION=	3
-CATEGORIES=	editors elisp
-MASTER_SITES=	SF \
-		http://dryice.name/computer/FreeBSD/distfiles/
-
-MAINTAINER=	dryice@dryice.name
-COMMENT=	Doxymacs is Doxygen + {X}Emacs
-
-DEPRECATED=	Depends on www/w3-4, which is DEPRECATED
-EXPIRATION_DATE=	2011-10-31
-
-USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
-BUILD_DEPENDS=		${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3/w3.el:${PORTSDIR}/www/w3-4 \
-			xmllint:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS=		${BUILD_DEPENDS}
-
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.mk>
--- a/editors/doxymacs/distinfo
+++ b/editors/doxymacs/distinfo
@ -1,2 +0,0 @@
-SHA256 (doxymacs-1.8.0.tar.gz) = a23fd833bc3c21ee5387c62597610941e987f9d4372916f996bf6249cc495afa
-SIZE (doxymacs-1.8.0.tar.gz) = 133600
--- a/editors/doxymacs/pkg-descr
+++ b/editors/doxymacs/pkg-descr
@ -1,15 +0,0 @@
-Doxymacs is Doxygen + {X}Emacs.
-
-The purpose of the doxymacs project is to create a LISP package that
-will make using Doxygen from within {X}Emacs easier.
-
-It has the following features:
-
-    * ability to look up documentation for symbols from {X}Emacs in
-      the browser of your choice.
-    * easily insert Doxygen style comments into source.
-    * optionally use an "external" (i.e. written in C) XML parser to
-      speed up building the completion list.
-    * fontify Doxygen keywords.
-
-WWW: http://doxymacs.sourceforge.net/
--- a/editors/doxymacs/pkg-plist
+++ b/editors/doxymacs/pkg-plist
@ -1,5 +0,0 @@
-bin/doxymacs_parser
-%%EMACS_SITE_LISPDIR%%/doxymacs.el
-%%EMACS_SITE_LISPDIR%%/doxymacs.elc
-%%EMACS_SITE_LISPDIR%%/xml-parse.el
-%%EMACS_SITE_LISPDIR%%/xml-parse.elc
--- a/graphics/Makefile
+++ b/graphics/Makefile
@ -440,7 +440,6 @@
    SUBDIR += libGLU
    SUBDIR += libGLw
    SUBDIR += libafterimage
-    SUBDIR += libart
    SUBDIR += libart_lgpl
    SUBDIR += libaux
    SUBDIR += libboard
--- a/graphics/libart/Makefile
+++ b/graphics/libart/Makefile
@ -1,30 +0,0 @@
-# New ports collection makefile for:	libart
-# Date created:		8 July 2001
-# Whom:			Hye-Shik Chang <perky@python.or.kr>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libart
-PORTVERSION=	2.3.3
-CATEGORIES=	graphics
-MASTER_SITES=	http://tiger.bioinf.cs.uni-potsdam.de/free/Graphics/ \
-		http://cvsup.theplanet.com/distfiles/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Library for high-performance 2D graphics
-
-# Depended on by textproc/p5-XML-LibRSVG
-BROKEN=	Does not fetch
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-11-06
-
-USE_AUTOTOOLS=	libtool
-WRKSRC=		${WRKDIR}/${PORTNAME}_lgpl-${PORTVERSION}
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=	yes
-
-CONFLICTS=	libart_lgpl-*
-
-.include <bsd.port.mk>
--- a/graphics/libart/distinfo
+++ b/graphics/libart/distinfo
@ -1,2 +0,0 @@
-SHA256 (libart-2.3.3.tar.gz) = f58c619a0720fdbc38e5d7f7ffd35529ca6e476d4dfc8c9316a47935a98cf903
-SIZE (libart-2.3.3.tar.gz) = 194479
--- a/graphics/libart/pkg-descr
+++ b/graphics/libart/pkg-descr
@ -1,8 +0,0 @@
-Libart is a library of functions for 2D graphics supporting
-a superset of the PostScript imaging model, designed to be
-integrated with graphics, artwork, and illustration programs.
-It is written in optimized C, and is fully compatible with
-C++. With a small footprint of 10,000 lines of code, it is
-especially suitable for embedded applications. 
-
-WWW: http://www.levien.com/libart/
--- a/graphics/libart/pkg-plist
+++ b/graphics/libart/pkg-plist
@ -1,49 +0,0 @@
-lib/libart_lgpl.so.5
-lib/libart_lgpl.so
-lib/libart_lgpl.la
-lib/libart_lgpl.a
-lib/libartConf.sh
-bin/libart-config
-include/libart_lgpl/art_affine.h
-include/libart_lgpl/art_alphagamma.h
-include/libart_lgpl/art_bpath.h
-include/libart_lgpl/art_config.h
-include/libart_lgpl/art_filterlevel.h
-include/libart_lgpl/art_gray_svp.h
-include/libart_lgpl/art_misc.h
-include/libart_lgpl/art_pathcode.h
-include/libart_lgpl/art_pixbuf.h
-include/libart_lgpl/art_point.h
-include/libart_lgpl/art_rect.h
-include/libart_lgpl/art_rect_svp.h
-include/libart_lgpl/art_rect_uta.h
-include/libart_lgpl/art_render.h
-include/libart_lgpl/art_render_gradient.h
-include/libart_lgpl/art_render_svp.h
-include/libart_lgpl/art_rgb.h
-include/libart_lgpl/art_rgb_affine.h
-include/libart_lgpl/art_rgb_bitmap_affine.h
-include/libart_lgpl/art_rgba.h
-include/libart_lgpl/art_rgb_pixbuf_affine.h
-include/libart_lgpl/art_rgb_rgba_affine.h
-include/libart_lgpl/art_rgb_svp.h
-include/libart_lgpl/art_svp.h
-include/libart_lgpl/art_svp_ops.h
-include/libart_lgpl/art_svp_point.h
-include/libart_lgpl/art_svp_render_aa.h
-include/libart_lgpl/art_svp_vpath.h
-include/libart_lgpl/art_svp_vpath_stroke.h
-include/libart_lgpl/art_svp_wind.h
-include/libart_lgpl/art_uta.h
-include/libart_lgpl/art_uta_ops.h
-include/libart_lgpl/art_uta_rect.h
-include/libart_lgpl/art_uta_vpath.h
-include/libart_lgpl/art_uta_svp.h
-include/libart_lgpl/art_vpath.h
-include/libart_lgpl/art_vpath_bpath.h
-include/libart_lgpl/art_vpath_dash.h
-include/libart_lgpl/art_vpath_svp.h
-include/libart_lgpl/libart.h
-include/libart_lgpl/libart-features.h
-@dirrm include/libart_lgpl
-share/aclocal/libart.m4
--- a/java/Makefile
+++ b/java/Makefile
@ -90,7 +90,6 @@
    SUBDIR += jaxen
    SUBDIR += jbootstrap
    SUBDIR += jboss2
-    SUBDIR += jboss4
    SUBDIR += jboss5
    SUBDIR += jc
    SUBDIR += jcalendar
--- a/java/jboss4/Makefile
+++ b/java/jboss4/Makefile
@ -1,149 +0,0 @@
-# ports collection makefile for: jboss2
-# Date created:                  16 April 2002
-# Whom:                          Ernst de Haan <znerd@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	${APP_TITLE:L}
-PORTVERSION=	4.2.3.GA
-PORTEPOCH=	1
-CATEGORIES=	java devel
-MASTER_SITES=	SF/${PORTNAME}/JBoss/JBoss-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Open-source J2EE application server (4.x family)
-
-# Depended on by mail/jboss-mailservices
-BROKEN=		does not build with new ant
-DEPRECATED=	BROKEN for more than 6 months
-EXPIRATION_DATE=	2011-10-31
-
-LATEST_LINK=	jboss4
-USE_JAVA=	yes
-JAVA_VERSION=	1.5
-USE_ANT=	yes
-MAKE_ARGS=	-buildfile build/build.xml
-
-USE_RC_SUBR=	jboss4
-SUB_FILES=	pkg-install pkg-deinstall pkg-message daemonctl.c daemonctl.1
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.endif
-
-APP_HOME?=	${PREFIX}/${APP_SHORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
-LOG_DIR=	${APP_HOME}/log
-APP_TITLE=	JBoss
-APP_SHORTNAME=	${UNIQUENAME}
-CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
-CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
-CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${USE_RC_SUBR}
-USER=		www
-GROUP=		www
-STDOUT_LOG=	${LOG_DIR}/stdout.log
-STDERR_LOG=	${LOG_DIR}/stderr.log
-AUTO_START?=	NO
-STOP_TIMEOUT?=	5
-PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-JAVA_OPTS=
-JAVA_CP=	bin/run.jar:${JAVA_HOME}/lib/tools.jar
-JAVA_MAIN=	org.jboss.Main
-DAEMONCTL_DIR=	${FILESDIR}
-DAEMONCTL_FILES=daemonctl.c daemonctl.1 startup.sh pkg-message
-MAN1=		${CONTROL_SCRIPT_NAME}.1
-
-JBOSSOUTPUT=	${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION}
-APP_HOME_FILES=	bin client lib server
-
-PLIST_FILES=	${CONTROL_SCRIPT:S,^${PREFIX}/,,} \
-		${STDOUT_LOG:S,^${PREFIX}/,,} \
-		${STDERR_LOG:S,^${PREFIX}/,,}
-
-SUB_LIST=	APP_HOME=${APP_HOME} \
-		APP_SHORTNAME=${APP_SHORTNAME} \
-		APP_TITLE=${APP_TITLE} \
-		CONTROL_SCRIPT=${CONTROL_SCRIPT} \
-		CONTROL_SCRIPT_MANPAGE_TITLE=${CONTROL_SCRIPT_MANPAGE_TITLE} \
-		CONTROL_SCRIPT_NAME=${CONTROL_SCRIPT_NAME} \
-		GROUP=${GROUP} \
-		JAVA=${JAVA} \
-		JAVA_CP=${JAVA_CP} \
-		JAVA_HOME=${JAVA_HOME} \
-		JAVA_MAIN=${JAVA_MAIN} \
-		JAVA_OPTS=${JAVA_OPTS} \
-		JAVA_PORT_VERSION=${JAVA_PORT_VERSION} \
-		JAVA_PORT_OS_DESCRIPTION=${JAVA_PORT_OS_DESCRIPTION} \
-		JAR_FILE=${JAR_FILE} \
-		LOG_DIR=${LOG_DIR} \
-		PID_FILE=${PID_FILE} \
-		PKGNAME=${PKGNAME} \
-		PORTNAME=${PORTNAME} \
-		PORTVERSION=${PORTVERSION} \
-		PREFIX=${PREFIX} \
-		STARTUP_SCRIPT=${STARTUP_SCRIPT} \
-		STDERR_LOG=${STDERR_LOG} \
-		STDOUT_LOG=${STDOUT_LOG} \
-		STOP_TIMEOUT=${STOP_TIMEOUT} \
-		USER=${USER}
-
-.include <bsd.port.pre.mk>
-
-post-configure:
-	@${ECHO_MSG} "Installation settings:"
-	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
-	@${ECHO_MSG} "   Control program location: ${CONTROL_SCRIPT}"
-	@${ECHO_MSG} "   Startup script location:  ${STARTUP_SCRIPT}"
-	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
-	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
-	@${ECHO_MSG} "   Startup Java Options:     ${JAVA_OPTS}"
-	@${ECHO_MSG} "   Running as (user/group):  ${USER}/${GROUP}"
-	@${ECHO_MSG} "   Logfile stdout:           ${STDOUT_LOG}"
-	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
-	@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
-	@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
-
-post-patch:
-	@${ECHO_MSG} -n ">> Removing unneeded files..."
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
-	@${ECHO_MSG} " [ DONE ]"
-
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	cd ${WRKDIR} && ${CC} ${CFLAGS} -o ${CONTROL_SCRIPT_NAME} daemonctl.c
-	${MKDIR} ${APP_HOME} && ${CHOWN} ${USER}:${GROUP} ${APP_HOME}
-	${MKDIR} ${LOG_DIR} && ${CHOWN} ${USER}:${GROUP} ${LOG_DIR}
-	(cd ${JBOSSOUTPUT} && ${FIND} ${APP_HOME_FILES} |\
-		${CPIO} -pdmu -R ${USER}:${GROUP} ${APP_HOME})
-	${INSTALL} -o ${USER} -g ${GROUP} -m 06754\
-		${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
-	${INSTALL} -o ${USER} -g ${GROUP} -m 0640 /dev/null ${STDOUT_LOG}
-	${INSTALL} -o ${USER} -g ${GROUP} -m 0640 /dev/null ${STDERR_LOG}
-	${INSTALL} -o ${USER} -g ${GROUP} -m 0640 /dev/null ${PID_FILE}
-	${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
-.if !defined(NOPORTDOCS)
-	cd ${JBOSSOUTPUT}/docs \
-		&& ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-		&& ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-.endif
-
-post-install:
-	@${FIND} -s ${APP_HOME_FILES:S,^,${JBOSSOUTPUT}/,} -not -type d | \
-		${SED} -ne 's,^${JBOSSOUTPUT},${APP_HOME:S,${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s -d ${APP_HOME_FILES:S,^,${JBOSSOUTPUT}/,} -type d | \
-		${SED} -ne 's,^${JBOSSOUTPUT},@dirrm ${APP_HOME:S,${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm ${APP_HOME:S,^${PREFIX}/,,}/log" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm ${APP_HOME:S,^${PREFIX}/,,}" >> ${TMPPLIST}
-.if ${AUTO_START} == "YES"
-	@${CONTROL_SCRIPT} start || true
-.endif
-.if !defined(BATCH)
-	@${CAT} ${PKGMESSAGE}
-.endif
-
-.include <bsd.port.post.mk>
--- a/java/jboss4/distinfo
+++ b/java/jboss4/distinfo
@ -1,2 +0,0 @@
-SHA256 (jboss-4.2.3.GA-src.tar.gz) = 842895ddcc4be58301ed9eb5c726798f895a5fc4831ddeefec84653ee7b1652e
-SIZE (jboss-4.2.3.GA-src.tar.gz) = 100367559
--- a/java/jboss4/files/daemonctl.1.in
+++ b/java/jboss4/files/daemonctl.1.in
@ -1,78 +0,0 @@
-.Dd February 21, 2002
-.Dt %%CONTROL_SCRIPT_MANPAGE_TITLE%% 1
-.Os FreeBSD
-.Sh NAME
-.Nm %%CONTROL_SCRIPT_NAME%%
-.Nd %%APP_TITLE%% server control interface
-.Sh SYNOPSIS
-.Nm
-.Op Fl java-options
-.Ar {start|restart|stop}
-.Sh DESCRIPTION
-The
-.Nm
-program provides an restricted interface to the %%APP_TITLE%%
-application server. The
-.Nm
-program is only accessible to users in the 'www' group, and will
-only invoke the %%JAVA_PORT_OS_DESCRIPTION%% %%JAVA_PORT_VERSION%% JVM.
-.Pp
-Any Java options listed are handed off directly to the JVM. Any
-classpath options will be ignored.
-.Pp
-The program expects exactly one of the following terminating commands:
-.Bl -tag -width indent
-.It Ar start
-Start %%APP_TITLE%%, if it is not already running.
-.It Ar restart
-Restart %%APP_TITLE%%. If it is already running, then it will be stopped and
-then started right after that. Otherwise it will just be started up.
-.It Ar stop
-Stop %%APP_TITLE%%, if it is actually running.
-.El
-.Sh ERRORS
-The following error conditions are detected. They will be checked in the
-specified order. In each case an error message is printed with the name of the
-control program prepended.
-.Pp
-If no argument is passed, then a simple help message is printed and the
-program exists with error code 0.
-.Pp
-If at least one argument is passed, but it is different from
-.Ar start ,
-.Ar restart
-or
-.Ar stop
-then the help message is printed as well, and the program exits with error
-code 1.
-.Pp
-The following errors conditions are defined:
-.Bl -tag -width indent
-.It Em Illegal program argument (error code 1)
-.It Em PID file not found (error code 2)
-.It Em PID file too large (error code 3)
-.It Em PID file contains illegal character (error code 4)
-.It Em Kill of process failed (error code 5)
-.It Em %%APP_TITLE%% is already running (error code 6)
-.It Em %%APP_TITLE%% is not running (error code 7)
-.It Em Unable to chdir to the %%APP_TITLE%% home directory (error code 8)
-.It Em Unable to open the stdout log file (error code 9)
-.It Em Unable to open the stderr log file (error code 10)
-.It Em Unable to start %%APP_TITLE%% (error code 11)
-.El
-.Sh FILES
-.Bl -tag -width -indent
-.It Pa %%PID_FILE%%
-The %%APP_TITLE%% PID file that is used to store the process ID of the
-currently running process in. It is emptied as soon as the server is stopped
-and filled with the process ID when it is started. It should never be writable
-for anyone but
-.Em www ,
-.It Pa %%STARTUP_SCRIPT%%
-A script that starts the
-.Nm
-program. It is used to start %%APP_TITLE%% at startup time.
-.El
-.Sh AUTHORS
-.An Ernst de Haan Aq znerd@FreeBSD.org
-.An Jonathan Chen Aq jonc@chen.org.nz
--- a/java/jboss4/files/daemonctl.c.in
+++ b/java/jboss4/files/daemonctl.c.in
@ -1,557 +0,0 @@
-/*
- * -*- mode: Fundamental; tab-width: 4; -*-
- * ex:ts=4
- *
- * Daemon control program, with Java Startup options.
- *
- *	Original by Ernst de Haan <znerd@freebsd.org>
- *	www/jakarta-tomcat4/files/daemonctl.c
- *
- * $FreeBSD$
- */
-
-#include <assert.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-
-#define	TRUE	1
-#define	FALSE	0
-
-/* The interval in seconds between the checks to make sure the process
-   died after a kill */
-#define STOP_TIME_INTERVAL		1
-
-#define ERR_ILLEGAL_ARGUMENT				1
-#define ERR_PID_FILE_NOT_FOUND				2
-#define ERR_KILL_FAILED						5
-#define ERR_ALREADY_RUNNING					6
-#define ERR_NOT_RUNNING						7
-#define ERR_CHDIR_TO_APP_HOME				8
-#define ERR_ACCESS_JAR_FILE					17
-#define ERR_STDOUT_LOGFILE_OPEN				9
-#define ERR_STDERR_LOGFILE_OPEN				10
-#define ERR_FORK_FAILED						11
-#define ERR_STAT_JAVA_HOME					12
-#define ERR_JAVA_HOME_NOT_DIR				13
-#define ERR_STAT_JAVA_CMD					14
-#define ERR_JAVA_CMD_NOT_FILE				15
-#define ERR_JAVA_CMD_NOT_EXECUTABLE			16
-
-/*
-	Function declarations.
- */
-static void printUsage (void);
-static int readPID (void);
-static void writePID (int pid);
-static void clearPID (void);
-static void start (int javaOpt, char * javaArgs [], int jbossOpt, char * jbossArgs []);
-static void stop (void);
-static void restart (int javaOpt, char * javaArgs [], int jbossOpt, char * jbossArgs []);
-static void logOutput (char *);
-
-/*
-	Globals
- */
-static int isQuiet = FALSE;
-static char * optQuiet = "-q",			/* quiet option */
-			* optConfig = "-config";	/* jboss configuration option */
-
-/**
- * Main function. This function is called when this program is executed.
- *
- * @param argc
- *    the number of arguments plus one, so always greater than 0.
- *
- * @param argv
- *    the arguments in an array of character pointers, where the last argument
- *    element is followed by a NULL element.
- */
-int
-main (
- int argc,
- char *argv [])
-{
-	/* Declare variables, like all other good ANSI C programs do :) */
-	int i, javaOpt, jbossOpt;
-	char *argument, **javaArgs, **jbossArgs;
-
-	/* Parse the arguments */
-	if (argc < 2)
-	{
-		printUsage ();
-		return 0;
-	}
-
-	/* XXX: Fix for setting up the environment for the java wrapper script */
-	setuid (geteuid ());
-	setgid (getegid ());
-
-	/*
-		Build up java and jboss option blocks.
-	 */
-	javaOpt = jbossOpt = 0;
-	for (i = 1; i < argc; i++)
-	{
-		if (strcmp (argv [i], optQuiet) == 0)
-		{
-			isQuiet = TRUE;
-
-		} else if (strcmp (argv [i], optConfig) == 0)
-		{
-			jbossOpt += 2;
-			if (++i >= argc)
-			{
-				printUsage ();
-				return ERR_ILLEGAL_ARGUMENT;
-			}
-
-		} else if (*argv [i] == '-')
-		{
-			javaOpt++;
-		}
-	}
-	if (javaOpt == 0)
-		javaArgs = NULL;
-	else
-	{
-		int j = 0;
-		javaArgs = malloc (sizeof (char *) * javaOpt);
-		for (i = 0; i < argc; i++)
-		{
-			if (strcmp (argv [i], optQuiet) &&
-				strcmp (argv [i], optConfig) &&
-				*argv [i] == '-')
-			{
-				javaArgs [j++] = argv [i];
-			}
-		}
-	}
-	if (jbossOpt == 0)
-		jbossArgs = NULL;
-	else
-	{
-		int j = 0;
-		jbossArgs = malloc (sizeof (char *) * jbossOpt);
-		for (i = 0; i < argc; i++)
-		{
-			if (strcmp (argv [i], optConfig) == 0)
-			{
-				jbossArgs [j++] = "-c";
-				jbossArgs [j++] = argv [++i];
-			}
-		}
-	}
-
-	/*
-		Decide on just what to call.
-	 */
-	argument = argv [argc - 1];
-	if (strcmp ("start", argument) == 0)
-	{
-		start (javaOpt, javaArgs, jbossOpt, jbossArgs);
-
-	} else if (strcmp ("stop", argument) == 0)
-	{
-		stop ();
-
-	} else if (strcmp ("restart", argument) == 0)
-	{
-		restart (javaOpt, javaArgs, jbossOpt, jbossArgs);
-
-	} else {
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Illegal argument \"%s\".\n", argument);
-		printUsage ();
-		exit (ERR_ILLEGAL_ARGUMENT);
-	}
-
-	return EXIT_SUCCESS;
-}
-
-/**
- * Prints usage information to stdout.
- */
-static void
-printUsage (void)
-{
-	printf ("Usage: %%CONTROL_SCRIPT_NAME%% [java-options] [-config jbossconfig] {start|stop|restart}\n");
-}
-
-/**
- * Reads a PID from the PID file.
- *
- * @return
- *    the PID, or -1 if the file was empty.
- */
-static int
-readPID (void)
-{
-	FILE * file;
-	int pid;
-
-	logOutput (">> Reading PID file (%%PID_FILE%%)...");
-	file = fopen ("%%PID_FILE%%", "r");
-	if (!file)
-	{
-		logOutput (" [ FAILED ]\n");
-		perror ("%%CONTROL_SCRIPT_NAME%%: Unable to open %%PID_FILE%% for reading: ");
-		exit (ERR_PID_FILE_NOT_FOUND);
-	}
-	if (fscanf (file, "%d", &pid) < 1)
-		pid = -1;
-	fclose (file);
-
-	logOutput (" [ DONE ]\n");
-	return pid;
-}
-
-/**
- * Writes a process ID to the specified file. The file is identified by a file
- * handle.
- *
- * @param pid
- *    the PID to store, always greater than 0.
- */
-static void
-writePID (
- int pid)
-{
-	FILE * file;
-
-	logOutput (">> Writing PID file...");
-	file = fopen ("%%PID_FILE%%", "w");
-	if (!file)
-	{
-		logOutput (" [ FAILED ]\n");
-		perror ("%%CONTROL_SCRIPT_NAME%%: Unable to open %%PID_FILE%% for writing: ");
-		exit (ERR_PID_FILE_NOT_FOUND);
-	}
-	fprintf (file, "%d\n", pid);
-	fclose (file);
-
-	logOutput (" [ DONE ]\n");
-}
-
-/**
-	Truncate the PID file.
- */
-static void
-clearPID (void)
-{
-	if (truncate ("%%PID_FILE%%", 0) != 0)
-	{
-		perror ("%%CONTROL_SCRIPT_NAME%%: Unable to clear %%PID_FILE%%: ");
-		exit (ERR_PID_FILE_NOT_FOUND);
-	}
-}
-
-/**
- * Checks if the specified process is running.
- *
- * @param pid
- *    the process id, greater than 0.
- *
- * @return
- *    0 if the specified process is not running, a different value otherwise.
- */
-static int
-existsProcess (
- int pid)
-{
-	int result;
-
-	/* Check preconditions */
-	assert (pid > 0);
-
-	/* See if the process exists */
-   	result = kill (pid, 0);
-
-	/* If the result is 0, then the process exists */
-	return result == 0;
-}
-
-/**
- * Kills the process identified by the specified ID.
- *
- * @param pid
- *    the process id, greater than 0.
- */
-static void
-killProcess (
- int pid)
-{
-	int result;
-	unsigned int waited;
-	unsigned int forced;
-	unsigned int interval = STOP_TIME_INTERVAL;
-	unsigned int timeout  = %%STOP_TIMEOUT%%;
-
-	/* Check preconditions */
-	assert (pid > 0);
-
-	if (!isQuiet)
-		printf (">> Terminating process %d...", pid);
-	result = kill (pid, SIGTERM);
-	if (result < 0) {
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to kill process %d: ", pid);
-		perror (NULL);
-		exit (ERR_KILL_FAILED);
-	}
-
-	/* Wait until the process is actually killed */
-    result = existsProcess (pid);
-	for (waited=0; result == 1 && waited < timeout; waited += interval)
-	{
-		logOutput (".");
-		fflush (stdout);
-		sleep (interval);
-    	result = existsProcess (pid);
-	}
-
-	/* If the process still exists, then have no mercy and kill it */
-	forced = 0;
-	if (result == 1)
-	{
-		/* Force the process to die */
-		result = kill (pid, SIGKILL);
-		if (result == 0) {
-			forced = 1;
-			logOutput (" [ KILLED ]\n");
-			fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Process %d did not terminate within %%STOP_TIMEOUT%% sec. Killed.\n", pid);
-		} else if (result != ESRCH) {
-			logOutput (" [ FAILED ]\n");
-			fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to kill process %d: ", pid);
-			perror (NULL);
-			exit (ERR_KILL_FAILED);
-		}
-	}
-
-	if (forced == 0) {
-		logOutput (" [ DONE ]\n");
-	}
-}
-
-/**
- * Starts the daemon.
- */
-static void
-start (
- int javaOpt,
- char * javaArgs [],
- int jbossOpt,
- char * jbossArgs [])
-{
-	int i, argc;
-	char ** argv;
-	int pid;
-	int result;
-	int stdoutLogFile;
-	int stderrLogFile;
-	struct stat sb;
-
-	pid = readPID ();
-
-	logOutput (">> Starting %%APP_TITLE%% %%PORTVERSION%%...");
-	if (pid != -1)
-	{
-		/* Check if the process actually exists */
-		result = existsProcess (pid);
-		if (result == 1)
-		{
-			logOutput (" [ FAILED ]\n");
-			fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: %%APP_TITLE%% %%PORTVERSION%% is already running, PID is %d.\n", pid);
-			exit (ERR_ALREADY_RUNNING);
-		}
-	}
-
-	/* Check if the JDK home directory is actually a directory */
-	result = stat ("%%JAVA_HOME%%", &sb);
-	if (result != 0) {
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to stat %%JAVA_HOME%%: ");
-		perror (NULL);
-		exit (ERR_STAT_JAVA_HOME);
-	}
-	if (!S_ISDIR (sb.st_mode)) {
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Java home directory %%JAVA_HOME%% is not a directory.\n");
-		exit (ERR_JAVA_HOME_NOT_DIR);
-	}
-
-	/* Check if the Java command is actually an executable regular file */
-	result = stat ("%%JAVA%%", &sb);
-	if (result != 0) {
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to stat %%JAVA%%: ");
-		perror (NULL);
-		exit (ERR_STAT_JAVA_CMD);
-	}
-	if (!S_ISREG (sb.st_mode)) {
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Java command %%JAVA%% is not a regular file.\n");
-		exit (ERR_JAVA_CMD_NOT_FILE);
-	}
-	result = access ("%%JAVA%%", X_OK);
-	if (result != 0) {
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Java command %%JAVA%% is not executable: ");
-		perror (NULL);
-		exit (ERR_JAVA_CMD_NOT_EXECUTABLE);
-	}
-
-	/* Change directory */
-	result = chdir ("%%APP_HOME%%");
-	if (result < 0) {
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to access directory %%APP_HOME%%: ");
-		perror (NULL);
-		exit (ERR_CHDIR_TO_APP_HOME);
-	}
-
-	/* See if the JAR file exists */
-	result = access ("%%APP_HOME%%/%%JAR_FILE%%", R_OK);
-	if (result < 0) {
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to access JAR file %%APP_HOME%%/%%JAR_FILE%%: ");
-		perror (NULL);
-		exit (ERR_ACCESS_JAR_FILE);
-	}
-
-	/* Open the stdout log file */
-	stdoutLogFile = open ("%%STDOUT_LOG%%", O_WRONLY);
-	if (stdoutLogFile < 0) {
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to open %%STDOUT_LOG%% for writing: ");
-		perror (NULL);
-		exit (ERR_STDOUT_LOGFILE_OPEN);
-	}
-	lseek (stdoutLogFile, (off_t) 0, SEEK_END);
-
-	/* Open the stderr log file */
-	stderrLogFile = open ("%%STDERR_LOG%%", O_WRONLY);
-	if (stderrLogFile < 0) {
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to open %%STDERR_LOG%% for writing: ");
-		perror (NULL);
-		exit (ERR_STDERR_LOGFILE_OPEN);
-	}
-	lseek (stderrLogFile, (off_t) 0, SEEK_END);
-
-	/* Split this process in two */
-	switch (pid = fork ())
-	{
-	case -1:
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to fork: ");
-		perror (NULL);
-		exit (ERR_FORK_FAILED);
-		break;
-
-	case 0:
-		/* Redirect stdout to log file */
-		dup2 (stdoutLogFile, STDOUT_FILENO);
-
-		/* Redirect stderr to log file */
-		dup2 (stderrLogFile, STDERR_FILENO);
-
-		/* TODO: Support redirection of both stdout and stderr to the same
-				 file using pipe (2) */
-
-		/*
-			Build the argument vector, with the java/jboss options if any.
-		 */
-		argv = malloc (sizeof (char *) * (javaOpt + jbossOpt + 5));
-		argc = 0;
-		argv [argc++] = "%%JAVA%%";
-		for (i = 0; i < javaOpt; i++)
-			argv [argc++] = javaArgs [i];
-		argv [argc++] = "-cp";
-		argv [argc++] = "%%JAVA_CP%%";
-		argv [argc++] = "%%JAVA_MAIN%%";
-		for (i = 0; i < jbossOpt; i++)
-			argv [argc++] = jbossArgs [i];
-		argv [argc++] = NULL;
-
-		/* Execute the command */
-		execv (argv [0], argv);
-		perror (NULL);
-		break;
-
-	default:
-		logOutput (" [ DONE ]\n");
-		writePID (pid);
-	}
-}
-
-/**
- * Stops the daemon.
- */
-static void
-stop (void)
-{
-	int pid;
-
-	pid = readPID ();
-
-	logOutput (">> Checking if %%APP_TITLE%% %%PORTVERSION%% is running...");
-
-	/* If there is a PID, see if the process still exists */
-	if (pid != -1)
-	{
-		int result = kill (pid, 0);
-		if (result != 0 && errno == ESRCH)
-		{
-			clearPID ();
-			pid = -1;
-		}
-	}
-
-	/* If there is no running process, produce an error */
-	if (pid == -1)
-	{
-		logOutput (" [ FAILED ]\n");
-		fprintf (stderr, "%%CONTROL_SCRIPT_NAME%%: %%APP_TITLE%% %%PORTVERSION%% is currently not running.\n");
-		exit (ERR_NOT_RUNNING);
-	}
-	logOutput (" [ DONE ]\n");
-
-	/* Terminate the process */
-	killProcess (pid);
-	clearPID ();
-}
-
-
-/**
- * Restarts the process. If it not currently running, then it will fail.
- */
-static void
-restart (
- int javaOpt,
- char * javaArgs [],
- int jbossOpt,
- char * jbossArgs [])
-{
-	stop ();
-	start (javaOpt, javaArgs, jbossOpt, jbossArgs);
-}
-
-/**
-	Output log to stdout.
- */
-static void
-logOutput (
- char * string)
-{
-	if (!isQuiet)
-		printf (string);
-}
--- a/java/jboss4/files/jboss4.in
+++ b/java/jboss4/files/jboss4.in
@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# %%APP_TITLE%% startup script.
-#
-# $FreeBSD$
-#
-
-# PROVIDE: %%APP_SHORTNAME%%
-# REQUIRE: NETWORKING SERVERS
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable %%APP_SHORTNAME%%:
-# %%APP_SHORTNAME%%_enable (bool):		Set to "NO" by default.
-#				Set it to "YES" to enable %%APP_SHORTNAME%%
-# %%APP_SHORTNAME%%_flags (str):		Set to "-server" by default.
-#				Extra JVM flags.
-# %%APP_SHORTNAME%%_config (str):		Set to "" by default
-#				JBoss server config, eg {all|default|minimal|standard}
-#
-. /etc/rc.subr
-
-name="%%APP_SHORTNAME%%"
-rcvar=`set_rcvar`
-
-start_cmd="%%APP_SHORTNAME%%_start"
-restart_cmd="%%APP_SHORTNAME%%_restart"
-pidfile="%%PID_FILE%%"
-procname="%%JAVA%%"
-
-[ -z "$%%APP_SHORTNAME%%_enable" ]	&& %%APP_SHORTNAME%%_enable="NO"
-[ -z "$%%APP_SHORTNAME%%_flags" ]	&& %%APP_SHORTNAME%%_flags="-server"
-
-%%APP_SHORTNAME%%_start ()
-{
-	checkyesno %%APP_SHORTNAME%%_enable &&
-	{
-		if [ ! -f ${pidfile} ]
-		then
-			touch ${pidfile}
-			chown %%USER%%:%%GROUP%% ${pidfile}
-		fi
-
-		echo "Starting %%APP_SHORTNAME%%."
-		%%CONTROL_SCRIPT%% -q ${%%APP_SHORTNAME%%_flags} ${%%APP_SHORTNAME%%_configflag} ${%%APP_SHORTNAME%%_config} start
-	}
-}
-
-%%APP_SHORTNAME%%_restart ()
-{
-	checkyesno %%APP_SHORTNAME%%_enable &&
-	{
-		echo "Restarting %%APP_SHORTNAME%%."
-		%%CONTROL_SCRIPT%% -q ${%%APP_SHORTNAME%%_flags} ${%%APP_SHORTNAME%%_configflag} ${%%APP_SHORTNAME%%_config} restart
-	}
-}
-
-load_rc_config $name
-
-[ -n "${%%APP_SHORTNAME%%_config}" ] && %%APP_SHORTNAME%%_configflag="-config"
-
-run_rc_command "$1"
--- a/java/jboss4/files/patch-ant-build
+++ b/java/jboss4/files/patch-ant-build
@ -1,45 +0,0 @@
-$FreeBSD$
-
-These patches disables the ant version checks.
-
-diff -ruN /tmp/jboss-4.2.1.GA-src/tools/etc/buildmagic/build-common.xml ./tools/etc/buildmagic/build-common.xml
--- /tmp/jboss-4.2.1.GA-src/tools/etc/buildmagic/build-common.xml	Sat May 12 06:24:27 2007
-+++ ./tools/etc/buildmagic/build-common.xml	Tue Jun 19 13:56:11 2007
-@@ -9,10 +9,12 @@
-    -->
- 
-   <condition property="buildmagic.ant.compatible">
-+	<!--
-     <or>
-       <contains string="${ant.version}" 
- 	        substring="Ant version ${buildmagic.ant16.baseversion}"/>
-     </or>
-+	  -->
-   </condition>
- 
-   <fail unless="buildmagic.ant.compatible">
-diff -ruN /tmp/jboss-4.2.1.GA-src/tools/etc/buildmagic/buildmagic.ent ./tools/etc/buildmagic/buildmagic.ent
--- /tmp/jboss-4.2.0.GA-src/tools/etc/buildmagic/buildmagic.ent	Sat May 12 06:24:27 2007
-+++ ./tools/etc/buildmagic/buildmagic.ent	Tue Jun 19 14:03:55 2007
-@@ -11,19 +11,8 @@
-   <property name="buildmagic.ant15.baseversion" value="1.5"/>
-   <property name="buildmagic.ant16.baseversion" value="1.6"/>
-   
-  <!--
-     | Add new conditions for other supported Ant versions when they
-     | become avaialble.
-   -->
-
-  <condition property="buildmagic.ant.compatible">
-    <or>
-      <contains string="${ant.version}"
-        substring="Ant version ${buildmagic.ant15.baseversion}"/>
-      <contains string="${ant.version}"
-        substring="Ant version ${buildmagic.ant16.baseversion}"/>
-    </or>
-  </condition>
-+  <!-- disable ant checks -->
-+  <property name="buildmagic.ant.compatible" value="forced"/>
- 
-   <fail unless="buildmagic.ant.compatible">
- 
--- a/java/jboss4/files/patch-serial-autoinc
+++ b/java/jboss4/files/patch-serial-autoinc
@ -1,86 +0,0 @@
-$FreeBSD$
-
-This patch allows JBoss to correctly create tables when
-using the auto-increment feature with Postgresql.
-
-diff -ruN ./server/src/etc/conf/default/standardjbosscmp-jdbc.xml /home/jonc/ports/jboss4/work/jboss-4.0.2-src/server/src/etc/conf/default/standardjbosscmp-jdbc.xml
--- ./server/src/etc/conf/default/standardjbosscmp-jdbc.xml	Thu Jan 27 07:51:35 2005
-+++ /home/jonc/ports/jboss4/work/jboss-4.0.2-src/server/src/etc/conf/default/standardjbosscmp-jdbc.xml	Tue May 17 16:13:34 2005
-@@ -1293,7 +1293,7 @@
-          <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-          <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-          <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1</auto-increment-template>
-+         <auto-increment-template>?1 serial</auto-increment-template>
-          <alias-header-prefix>t</alias-header-prefix>
-          <alias-header-suffix>_</alias-header-suffix>
-          <alias-max-length>32</alias-max-length>
-@@ -1420,7 +1420,7 @@
-          <row-locking-template>SELECT ?1 FROM ?2 WHERE ?3 ORDER BY ?4 FOR UPDATE</row-locking-template>
-          <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-          <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1</auto-increment-template>
-+         <auto-increment-template>?1 serial</auto-increment-template>
-          <alias-header-prefix>t</alias-header-prefix>
-          <alias-header-suffix>_</alias-header-suffix>
-          <alias-max-length>32</alias-max-length>
-@@ -1674,7 +1674,7 @@
-          <row-locking-template/>
-          <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-          <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1 IDENTITY</auto-increment-template>
-+         <auto-increment-template>?1 ?2 ?3 IDENTITY</auto-increment-template>
-          <add-column-template>ALTER TABLE ?1 ADD COLUMN ?2 ?3</add-column-template>
-          <drop-column-template>ALTER TABLE ?1 DROP COLUMN ?2</drop-column-template>
-          <alias-header-prefix>t</alias-header-prefix>
-@@ -1973,7 +1973,7 @@
-               <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-          -->
-          <fk-constraint-template>ALTER TABLE ?1 ADD INDEX (?3), ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1 auto_increment</auto-increment-template>
-+         <auto-increment-template>?1 ?2 ?3 auto_increment</auto-increment-template>
-          <alter-column-template>ALTER TABLE ?1 MODIFY ?2 ?3</alter-column-template>
-          <alias-header-prefix>t</alias-header-prefix>
-          <alias-header-suffix>_</alias-header-suffix>
-@@ -2113,7 +2113,7 @@
-          <row-locking-template>SELECT ?1 FROM ?2 with (updlock) WHERE ?3 ORDER BY ?4</row-locking-template>
-          <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-          <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1 IDENTITY</auto-increment-template>
-+         <auto-increment-template>?1 ?2 ?3 IDENTITY</auto-increment-template>
-          <alter-column-template>ALTER TABLE ?1 ALTER COLUMN ?2 ?3</alter-column-template>
-          <alias-header-prefix>t</alias-header-prefix>
-          <alias-header-suffix>_</alias-header-suffix>
-@@ -2245,7 +2245,7 @@
-          <row-locking-template>SELECT ?1 FROM ?2 with (xlock) WHERE ?3 ORDER BY ?4</row-locking-template>
-          <pk-constraint-template>CONSTRAINT ?1 PRIMARY KEY (?2)</pk-constraint-template>
-          <fk-constraint-template>ALTER TABLE ?1 ADD CONSTRAINT ?2 FOREIGN KEY (?3) REFERENCES ?4 (?5)</fk-constraint-template>
-         <auto-increment-template>?1 IDENTITY</auto-increment-template>
-+         <auto-increment-template>?1 ?2 ?3 IDENTITY</auto-increment-template>
-          <alias-header-prefix>t</alias-header-prefix>
-          <alias-header-suffix>_</alias-header-suffix>
-          <alias-max-length>32</alias-max-length>
-diff -ruN ./server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java /home/jonc/ports/jboss4/work/jboss-4.0.2-src/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java
--- ./server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java	Tue Oct 26 22:28:23 2004
-+++ /home/jonc/ports/jboss4/work/jboss-4.0.2-src/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java	Tue May 17 16:13:34 2005
-@@ -916,14 +916,18 @@
-       // apply auto-increment template
-       if(type.getAutoIncrement()[0])
-       {
-         String columnClause = SQLUtil.getCreateTableColumnsClause(type);
-          JDBCFunctionMappingMetaData autoIncrement =
-             manager.getMetaData().getTypeMapping().getAutoIncrementTemplate();
-          if(autoIncrement == null)
-          {
-             throw new IllegalStateException("auto-increment template not found");
-          }
-         String[] args = new String[]{columnClause};
-+         String[] args = new String[]
-+							{
-+								type.getColumnNames () [0],
-+								type.getSQLTypes () [0],
-+								type.getNotNull () [0] ? " not null " : ""
-+							};
-          autoIncrement.getFunctionSql(args, sqlBuffer);
-       }
-       else
--- a/java/jboss4/files/pkg-deinstall.in
+++ b/java/jboss4/files/pkg-deinstall.in
@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# This script does the following.
-#
-# * Checks if the JBoss PID file exists. If it does, it kills the
-#   JBoss process and removes the PID file.
-#
-# $FreeBSD$
-#
-
-# Make sure we're in the right stage of the process
-if [ "$2" = "DEINSTALL" ]; then
-
-	# Kill JBoss if it is still running
-	PID_FILE=/var/run/jboss.pid
-	if [ -s ${PID_FILE} ]; then
-		PID=`cat ${PID_FILE}`
-		echo -n ">> Killing JBoss Server process (${PID})..."
-		/bin/kill ${PID} > /dev/null 2> /dev/null
-		if [ $? -eq 0 ]; then
-			echo " [ DONE ]"
-		else
-			echo " [ FAILED ]"
-		fi
-		echo -n ">> Removing PID file (${PID_FILE})..."
-		rm ${PID_FILE} > /dev/null 2> /dev/null
-		if [ $? -eq 0 ]; then
-			echo " [ DONE ]"
-		else
-			echo " [ FAILED ]"
-		fi
-	fi
-fi
-
-exit 0
--- a/java/jboss4/files/pkg-install.in
+++ b/java/jboss4/files/pkg-install.in
@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# Checks if the 'www' user and group exist. If they don't, then
-# an attempt is made to create both.
-#
-# $FreeBSD$
-#
-
-# Make sure we're called during the 'make install' process
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-# Set some constants
-USER=www
-GROUP=${USER}
-UID=80
-GID=${UID}
-
-# See if the group already exists
-if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw groupadd ${GROUP} -g ${GID}; then
-		echo "Added group \"${GROUP}\"."
-	else
-		echo "Adding group \"${GROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-# See if the user already exists
-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
-
-	# If not, try to create it
-	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-		-s "/sbin/nologin" -d "/nonexistent" \
-		-c "World Wide Web Owner"; \
-	then
-		echo "Added user \"${USER}\"."
-	else
-		echo "Adding user \"${USER}\" failed..."
-		exit 1
-	fi
-fi
-exit 0
--- a/java/jboss4/files/pkg-message.in
+++ b/java/jboss4/files/pkg-message.in
@ -1,7 +0,0 @@
-%%PKGNAME%% has been installed in %%APP_HOME%%.
-
-If a user should be able to use %%CONTROL_SCRIPT_NAME%%, put it in the group '%%GROUP%%'.
-
-Use 'man %%CONTROL_SCRIPT_NAME%%' for information about starting and stopping %%APP_TITLE%%.
-
-To run the %%APP_TITLE%% server from startup, add %%APP_SHORTNAME%%_enable="YES" in your /etc/rc.conf. Extra options can be found in the startup script.
--- a/java/jboss4/pkg-descr
+++ b/java/jboss4/pkg-descr
@ -1,24 +0,0 @@
-JBoss AS 4 is an officially certified J2EE 1.4 application server. The
-certification guarantees that JBoss AS 4 conforms to the formal J2EE
-specification.
-
- supports J2EE Web Services including JAX-RPC (Java API for XML for 
-Remote Procedure Call) and the Web Services for J2EE Architecture.
-
- implements the JMS (Java Messaging Service) 1.1 specification.
-
- implements the JCA (Java Connector Architecture) 1.5 specification. 
-The JCA 1.5 specification adds support for the life cycle management of 
-resource adapters, worker thread management as well as transaction and 
-message inflow from the resource adapter to the application server.
-
- implements the Java Authorization Contract for Containers (JACC) 
-specification.
-
- implements the EJB 2.1 specification. The EJB 2.1 specification 
-extends the message-driven bean contracts to support other messaging 
-types in addition to JMS. It supports stateless session beans as web 
-service endpoints. It also includes a new container managed service 
-called the EJB timer service.
-
-WWW: http://www.jboss.org/
--- a/korean/Makefile
+++ b/korean/Makefile
@ -16,18 +16,14 @@
    SUBDIR += gimp-help
    SUBDIR += gtkcomm
    SUBDIR += h2ps
-    SUBDIR += hanterm
    SUBDIR += hanterm-xf86
    SUBDIR += hanyangfonts
    SUBDIR += hcode
-    SUBDIR += hlatex
-    SUBDIR += hlatex-psfonts-uhc-extra
    SUBDIR += hmconv
    SUBDIR += hpscat
    SUBDIR += hunspell
    SUBDIR += ibus-hangul
    SUBDIR += imhangul
-    SUBDIR += johabfonts
    SUBDIR += kaistfonts
    SUBDIR += kde3-i18n
    SUBDIR += kde4-l10n
@ -47,7 +43,6 @@
    SUBDIR += scim-hangul
    SUBDIR += scim-tables
    SUBDIR += stardict2-dict-kr
-    SUBDIR += texinfo
    SUBDIR += unfonts-core
    SUBDIR += unfonts-extra
    SUBDIR += unfonts-ttf
--- a/korean/hanterm/Makefile
+++ b/korean/hanterm/Makefile
@ -1,45 +0,0 @@
-# New ports collection makefile for:	hanterm3.04
-# Date created:		12 Mar 1997
-# Whom:			CHOI Junho <junker@jazz.snu.ac.kr>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	hanterm
-PORTVERSION=	3.1.6
-PORTREVISION=	3
-CATEGORIES=	korean x11
-MASTER_SITES=	http://hanterm.org/download/ \
-		ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An xterm hacked for managing Korean languages
-
-DEPRECATED=	Depends on korean/johabfonts, which is DEPRECATED
-EXPIRATION_DATE=	2011-10-31
-
-RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/johabm16.pcf.gz:${PORTSDIR}/korean/johabfonts
-
-CONFLICTS=	ko-hanterm-xf-2.*
-USE_IMAKE=	yes
-USE_XORG=	ice sm x11 xaw xext xmu xpm xt
-NO_INSTALL_MANPAGES= yes
-ALL_TARGET=	hanterm
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 900007
-BROKEN=		fails to build with new utmpx
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hanterm ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/Hanterm.ad \
-		${PREFIX}/lib/X11/app-defaults/Hanterm
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/devel/hanterm.html ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}/
-.endif
-
-.include <bsd.port.post.mk>
--- a/korean/hanterm/distinfo
+++ b/korean/hanterm/distinfo
@ -1,2 +0,0 @@
-SHA256 (hanterm-3.1.6.tar.gz) = 2686e4ba1ce6c42ec38e68a4d61722aa894543dae0f4f7d7eaa220dd9fa5d7e7
-SIZE (hanterm-3.1.6.tar.gz) = 323736
--- a/korean/hanterm/files/patch-automata.c
+++ b/korean/hanterm/files/patch-automata.c
@ -1,54 +0,0 @@
-diff -ruN automata.c.orig automata.c
--- automata.c.orig	Mon May 28 11:13:24 2001
-+++ automata.c	Wed Feb 20 02:37:27 2002
-@@ -112,15 +112,15 @@
- /* 9          :          ;          <          =          > */
-   '9' | F_A, ':' | F_A, ';' | F_A, '<' | F_A, '=' | F_A, '>' | F_A,
- /* ?          @          A          B          C          D */
-  '?' | F_A, '@' | F_A, 'A' | F_A, 'B' | F_A, 'C' | F_A, 'D' | F_A,
-+  '?' | F_A, '@' | F_A,  8 | F_C_C, 26 | F_V,  16 | F_A,  13 | F_C_C,
- /* E          F          G          H          I          J */
-  6 | F_C_F, 'F' | F_A, 'G' | F_A, 'H' | F_A, 'I' | F_A, 'J' | F_A,
-+  6 | F_C_F,  7 | F_C_C, 20 | F_C_C, 13 | F_V, 5 | F_V, 7 | F_V,
- /* K          L          M          N          O          P */
-  'K' | F_A, 'L' | F_A, 'M' | F_A, 'N' | F_A, 6 | F_V, 12 | F_V,
-+  3 | F_V, 29 | F_V, 27 | F_V, 20 | F_V, 6 | F_V, 12 | F_V,
- /* Q          R          S          T          U          V */
-  10 | F_C_F, 3 | F_C_C, 'S' | F_A, 12 | F_C_C, 'U' | F_A, 'V' | F_A,
-+  10 | F_C_F, 3 | F_C_C, 4 | F_C_C, 12 | F_C_C, 11 | F_V, 19 | F_C_C,
- /* W          X          Y          Z          [          \ */
-  15 | F_C_F, 'X' | F_A, 'Y' | F_A, 'Z' | F_A, '[' | F_A, '\\' | F_A,
-+  15 | F_C_F, 18| F_C_C, 19 | F_V, 17 | F_C_C, '[' | F_A, '\\' | F_A,
- /* ]          ^          _          `          a          b */
-   ']' | F_A, '^' | F_A, '_' | F_A, '`' | F_A, 8 | F_C_C, 26 | F_V,
- /* c          d          e          f          g          h */
-@@ -412,7 +412,7 @@
-      int c;
- {
-   /* 모음의 범위 검색 */
-  if (c < 'L' || c > 'y')
-+  if (c < 'A' || c > 'z')
-     return 0;
- 
-   if (table_for_2_qwerty[c - '!'] & F_V)
-@@ -435,9 +435,9 @@
-     /* 0   1   2   3   4   5   6   7   8   9   :   ;   <   =   > */
-        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-     /* ?   @   A   B   C   D   E   F   G   H   I   J   K   L   M */
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-+       0,  0,  17, 0,  25, 23, 8,  9,  29, 0,  0,  0,  0,  0,  0,
-     /* N   O   P   Q   R   S   T   U   V   W   X   Y   Z   [   \ */
-       0,  0,  0,  0,  3,  0,  22, 0,  0,  0,  0,  0,  0,  0,  0,
-+       0,  0,  0, 19,  3,  5,  22, 0,  28, 24, 27, 0, 26,  0,  0,
-     /* ]   ^   _   `   a   b   c   d   e   f   g   h   i   j   k */
-        0,  0,  0,  0,  17, 0,  25, 23, 8,  9,  29, 0,  0,  0,  0,
-     /* l   m   n   o   p   q   r   s   t   u   v   w   x   y   z */
-@@ -445,7 +445,7 @@
-   };
- 
-   /* 종성의 범위 검색 */
-  if (c < 'R' || c > 'z')
-+  if (c < 'A' || c > 'z')
-     return 0;
- 
-   if (table_for_2_qwerty[c - '!'] & F_C_L)
--- a/korean/hanterm/files/patch-charproc.c
+++ b/korean/hanterm/files/patch-charproc.c
@ -1,13 +0,0 @@
-*** charproc.c.orig	Fri May 24 01:55:07 2002
--- charproc.c	Fri May 24 01:55:12 2002
-***************
-*** 81,88 ****
-  
-  extern Widget toplevel;
-  extern void exit();
- extern char *malloc();
- extern char *realloc();
-  
-  extern void FlushScroll();
-  extern void InsertLine();
--- 81,86 ----
--- a/korean/hanterm/files/patch-main.c
+++ b/korean/hanterm/files/patch-main.c
@ -1,91 +0,0 @@
--- main.c.orig	Fri Oct 25 12:00:42 2002
-+++ main.c	Fri Oct 25 12:01:43 2002
-@@ -221,8 +221,13 @@
- #define HAS_UTMP_UT_HOST
- #endif
- #else /* SYSV */
-#ifndef linux
-#include <sgtty.h>
-+#ifdef __FreeBSD__
-+#include <termios.h>
-+#define USE_TERMIOS
-+#define USE_TERMINFO
-+#define USE_SYSV_TERMIO
-+#define termio termios
-+#define USE_POSIX_WAIT
- #endif
- #include <sys/resource.h>
- #define HAS_UTMP_UT_HOST
-@@ -1056,11 +1061,13 @@
- #ifdef ECHOCTL
-         d_tio.c_lflag |= ECHOCTL|IEXTEN;
- #endif
-+#ifndef __FreeBSD__
- #ifdef NTTYDISC
-         d_tio.c_line = NTTYDISC;
- #else
- 	d_tio.c_line = 0;
- #endif
-+#endif
- #ifdef sgi
-         d_tio.c_cflag &= ~(HUPCL|PARENB);
-         d_tio.c_iflag |= BRKINT|ISTRIP|IGNPAR;
-@@ -1111,7 +1118,11 @@
- 
- 	    for (i = 0; i <= 2; i++) {
- 		struct termio deftio;
-+#ifdef USE_TERMIOS
-+		if (tcgetattr(i, &deftio) == 0) {
-+#else
- 		if (ioctl (i, TCGETA, &deftio) == 0) {
-+#endif
- 		    d_tio.c_cc[VINTR] = deftio.c_cc[VINTR];
- 		    d_tio.c_cc[VQUIT] = deftio.c_cc[VQUIT];
- 		    d_tio.c_cc[VERASE] = deftio.c_cc[VERASE];
-@@ -2021,7 +2032,11 @@
- 				lmode = d_lmode;
- #endif	/* TIOCLSET */
- #ifdef USE_SYSV_TERMIO
-+#ifdef USE_TERMIOS
-+                        if(tcgetattr(tty, &tio) == -1)
-+#else
-                         if(ioctl(tty, TCGETA, &tio) == -1)
-+#endif
-                                 tio = d_tio;
- 
- #else	/* not USE_SYSV_TERMIO */
-@@ -2389,19 +2404,17 @@
- 		    tio.c_iflag &= ~(INLCR|IGNCR|ISTRIP);
- 		    tio.c_iflag |= ICRNL;
- 		    /* ouput: cr->cr, nl is not return, no delays, ln->cr/nl */
-		    tio.c_oflag &=
-		     ~(OCRNL|ONLRET|NLDLY|CRDLY|TABDLY|BSDLY|VTDLY|FFDLY);
-+		    tio.c_oflag &= ~(OCRNL|ONLRET);
- 		    tio.c_oflag |= ONLCR;
- #ifdef OPOST
- 		    tio.c_oflag |= OPOST;
- #endif /* OPOST */		    
- #ifdef BAUD_0
- 		    /* baud rate is 0 (don't care) */
-		    tio.c_cflag &= ~(CBAUD);
-+		    cfsetspeed(&tio, 0);
- #else	/* !BAUD_0 */
- 		    /* baud rate is 9600 (nice default) */
-		    tio.c_cflag &= ~(CBAUD);
-		    tio.c_cflag |= B9600;
-+		    cfsetspeed(&tio, 9600);
- #endif	/* !BAUD_0 */
- 		    /* dkim@surecom.com */
- 		    tio.c_cflag &= ~CSIZE;
-@@ -2512,7 +2525,11 @@
- 		    if (ioctl (tty, TIOCLSET, (char *)&lmode) == -1)
- 			    HsSysError(cp_pipe[1], ERROR_TIOCLSET);
- #endif	/* TIOCLSET */
-+#ifdef USE_TERMIOS
-+		    if (tcsetattr(tty, TCSANOW, &tio) == -1)
-+#else
- 		    if (ioctl (tty, TCSETA, &tio) == -1)
-+#endif
- 			    HsSysError(cp_pipe[1], ERROR_TIOCSETP);
- #else	/* USE_SYSV_TERMIO */
- 		    sg.sg_flags &= ~(ALLDELAY | XTABS | CBREAK | RAW);
--- a/korean/hanterm/files/patch-misc.c
+++ b/korean/hanterm/files/patch-misc.c
@ -1,22 +0,0 @@
--- misc.c.orig	Tue Jan  8 19:41:11 2002
-+++ misc.c	Fri Oct 25 12:10:43 2002
-@@ -904,18 +904,7 @@
- #endif
-     int n;
- {
-#if defined(linux) && defined(__GLIBC__)
-    extern const char *const sys_errlist[];
-#else
-#if (defined(BSD) && (BSD >= 199306))
-    /* in *BSD, should be null because it is already declared */
-#else
-    extern char *sys_errlist[];
-#endif
-#endif
-    extern int sys_nerr;
-
-    return ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
-+	return (strerror(n));
- }
- 
- 
--- a/korean/hanterm/pkg-descr
+++ b/korean/hanterm/pkg-descr
@ -1,9 +0,0 @@
-Hanterm
-------
-
-Hanterm is a hack of xterm for managing Korean language. We can input/output
-Korean language characters in hanterm, not using i18n facility of X11.
-It supports 2/3 type hangul keyboards, ksc5601/ksx1001 type X11 hangul
-fonts and Johab fonts, originally used in Hanterm early version.
-
-WWW: http://www.hanterm.org/
--- a/korean/hanterm/pkg-plist
+++ b/korean/hanterm/pkg-plist
@ -1,5 +0,0 @@
-bin/hanterm
-lib/X11/app-defaults/Hanterm
-%%PORTDOCS%%share/doc/hanterm/ChangeLog
-%%PORTDOCS%%share/doc/hanterm/hanterm.html
-%%PORTDOCS%%@dirrm share/doc/hanterm
--- a/korean/hlatex-psfonts-uhc-extra/Makefile
+++ b/korean/hlatex-psfonts-uhc-extra/Makefile
@ -1,50 +0,0 @@
-# New ports collection makefile for:    HLaTeX PS fonts(extra)
-# Date created:                 2 Jul 2000
-# Whom:                         CHOI Junho <cjh@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	HLaTeX-psfonts-${HLATEX_ENCODING}-extra
-PORTVERSION=	0.99
-PORTREVISION=	3
-CATEGORIES=	korean print
-MASTER_SITES=	ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/hlatex/
-DISTFILES=	${HLATEX_PSFONTS_EXTRA}
-DIST_SUBDIR=	hlatex
-EXTRACT_ONLY=
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Extra Korean PostScript font collection for HLaTeX(UHC encoding)
-
-DEPRECATED=	Depends on korean/hlatex, which is DEPRECATED
-EXPIRATION_DATE=	2011-10-31
-
-RUN_DEPENDS=	hbibtex:${PORTSDIR}/korean/hlatex
-
-# just install directly
-NO_BUILD=	YES
-NO_WRKSUBDIR=	YES
-
-TEXMF=		${PREFIX}/share/texmf
-
-# default encoding
-HLATEX_ENCODING=        uhc
-
-# extra fonts
-HLATEX_PSFONTS_EXTRA=	uhc-graphic.tar.gz uhc-bom.tar.gz \
-			uhc-gungseo.tar.gz uhc-pilgi.tar.gz \
-			uhc-pen.tar.gz uhc-shinmun.tar.gz \
-			uhc-yetgul.tar.gz uhc-jamo.tar.gz
-
-# Installation according to readme.ks
-do-install:
-	cd ${TEXMF}/fonts/; \
-	for fonts in ${HLATEX_PSFONTS_EXTRA}; \
-	do \
-		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-			${_DISTDIR}/$$fonts ${EXTRACT_AFTER_ARGS}; \
-	done; \
-	${PREFIX}/bin/texhash
-
-.include <bsd.port.mk>
--- a/korean/hlatex-psfonts-uhc-extra/distinfo
+++ b/korean/hlatex-psfonts-uhc-extra/distinfo
@ -1,16 +0,0 @@
-SHA256 (hlatex/uhc-graphic.tar.gz) = d42a532bb463304caaabca76543070b86487272f9ff6bf663bff190e4055a8a0
-SIZE (hlatex/uhc-graphic.tar.gz) = 3294846
-SHA256 (hlatex/uhc-bom.tar.gz) = 619f5126c4396d448e1e77c96882b9405ca78d3ed0e67bd1ef0e3087e153357d
-SIZE (hlatex/uhc-bom.tar.gz) = 1229417
-SHA256 (hlatex/uhc-gungseo.tar.gz) = 31df7bf0f186bf12ebfdbd18f6e25280da17d8e8fbe67f7f1b452c93b7ba3d53
-SIZE (hlatex/uhc-gungseo.tar.gz) = 5414280
-SHA256 (hlatex/uhc-pilgi.tar.gz) = b33a48e09fa27adcbae4dce2c7bb8c96045752ef7766ad35fd05c61ea26219f9
-SIZE (hlatex/uhc-pilgi.tar.gz) = 2305894
-SHA256 (hlatex/uhc-pen.tar.gz) = a3024fbe7b58287e0b49b8784bef38bff44bf0d59d9d3a19596b667a3f0f6c6b
-SIZE (hlatex/uhc-pen.tar.gz) = 2678371
-SHA256 (hlatex/uhc-shinmun.tar.gz) = 8d7229b3fd4ead8197f8ce43d044183743bc7bce25b58ac31ef0bdccb90a5b83
-SIZE (hlatex/uhc-shinmun.tar.gz) = 4794977
-SHA256 (hlatex/uhc-yetgul.tar.gz) = d2c0966d88be756058761e69fa25837e2a5dbdebc9c751c759f9874235a4abdb
-SIZE (hlatex/uhc-yetgul.tar.gz) = 5198946
-SHA256 (hlatex/uhc-jamo.tar.gz) = 36831affeaaedf68fb6c2d50b5b3b4a6b5abf15286eea6dcd4156b919c0b5d3d
-SIZE (hlatex/uhc-jamo.tar.gz) = 4158553
--- a/korean/hlatex-psfonts-uhc-extra/pkg-descr
+++ b/korean/hlatex-psfonts-uhc-extra/pkg-descr
@ -1,13 +0,0 @@
-HLaTeX PostScript Fonts(UHC)
-============================
-
-This is extra fonts collection for HLaTeX(0.99 and above).
-
- - Graphic
- - Bom
- - Gungseo
- - Pilgi
- - Pen
- - Shinmun
- - Yetgul
- - Jamo(Myoungjo, Gothic, Novell, Sora)
--- a/korean/hlatex-psfonts-uhc-extra/pkg-plist
+++ b/korean/hlatex-psfonts-uhc-extra/pkg-plist
--- a/korean/hlatex/Makefile
+++ b/korean/hlatex/Makefile
@ -1,143 +0,0 @@
-# New ports collection makefile for:    HLaTeX(UHC encoding)
-# Date created:                 2 Jul 2000
-# Whom:                         CHOI Junho <cjh@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	HLaTeX
-PORTVERSION=	1.0.1
-PORTREVISION=	4
-CATEGORIES=	korean print
-MASTER_SITES=	ftp://ftp.ktug.or.kr/pub/ktug/hlatex/ \
-		ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/
-DISTFILES=	HLaTeX-1.0.1.tar.gz uhc-fonts-1.0.tar.gz ${HLATEX_FONTS_BASE}
-DIST_SUBDIR=	hlatex
-EXTRACT_ONLY=	HLaTeX-1.0.1.tar.gz uhc-fonts-1.0.tar.gz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	LaTeX package to use Hangul(UTF-8/UHC/KSX1001)
-
-# Depended on by korean/hlatex-psfonts-uhc-extra korean/texinfo/Makefile
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-10-31
-
-# it depends on teTeX(lambda)
-BUILD_DEPENDS=	texhash:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-
-MACRO_DIR=	${WRKDIR}/HLaTeX
-FONT_DIR=	${WRKDIR}/uhc-fonts-1.0
-TEXMF=		${PREFIX}/share/texmf
-TEXMF_HLATEX=	${PREFIX}/share/texmf-hlatex
-
-# default fonts.
-HLATEX_FONTS_BASE=	uhc-myoungjo-1.0.tar.gz \
-			uhc-gothic-1.0.tar.gz \
-			uhc-taza-1.0.tar.gz
-# documents.
-HLATEX_DOC_BASE=	ChangeLog.ko NEWS-0.98.ko NEWS-0.99.ko NEWS-1.0.ko \
-			README.en VERSION-1.0.1 \
-			hlguide-k.bib hlguide-k.tex hlguide-u.bib \
-			hlguide-u.tex hlguide.bbl hlguide.ind hlguide.pdf \
-			hlguide.tex 
-HLATEX_DOC_FONT_BASE=	README hfontlist.pdf
-
-# Build hbibtex and hmakeindex
-do-build:
-	${CC} -O2 -pipe -o ${MACRO_DIR}/contrib/hbibtex \
-		${MACRO_DIR}/contrib/hbibtex.c
-	${CC} -O2 -pipe -o ${MACRO_DIR}/contrib/hmakeindex \
-		${MACRO_DIR}/contrib/hmakeindex.c
-	${AWK} 'BEGIN { FS = " |\{|\}" } \
-		{if ( $$1 == "TEXMF" ) \
-			{print "TEXMFHLATEX = ${TEXMF_HLATEX}"; \
-			 printf "%s%s%s", "TEXMF = {!!$$TEXMFHLATEX,", $$4, \
-			 "}"} \
-		 else print }' ${TEXMF}/web2c/texmf.cnf > ${WRKDIR}/texmf.cnf
-
-# Installation according to readme.ks
-do-install:
-	# Part 1: install directories
-	${MKDIR} ${TEXMF_HLATEX}/tex/latex/hlatex
-	${MKDIR} ${TEXMF_HLATEX}/tex/lambda/hlatex
-	${MKDIR} ${TEXMF_HLATEX}/omega/otp/hlatex
-	${MKDIR} ${TEXMF_HLATEX}/omega/ocp/hlatex
-	${MKDIR} ${TEXMF_HLATEX}/bibtex/bst/hlatex
-	${MKDIR} ${TEXMF_HLATEX}/makeindex
-	${MKDIR} ${TEXMF_HLATEX}/fonts/map/hlatex
-	${MKDIR} ${TEXMF_HLATEX}/doc/latex/hlatex/
-	${MKDIR} ${TEXMF_HLATEX}/doc/latex/hlatex/fonts
-
-	# Part 2: macros, style, font descriptions
-	${INSTALL_DATA} ${MACRO_DIR}/latex/* ${TEXMF_HLATEX}/tex/latex/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/lambda/u8hangul.tex \
-		${TEXMF_HLATEX}/tex/lambda/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/lambda/uhc-test.tex \
-		${TEXMF_HLATEX}/tex/lambda/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/lambda/*.fd \
-		${TEXMF_HLATEX}/tex/lambda/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/lambda/hlatex.otp \
-		${TEXMF_HLATEX}/omega/otp/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/lambda/hlatex.ocp \
-		${TEXMF_HLATEX}/omega/ocp/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/contrib/hbname-k.tex \
-		${TEXMF_HLATEX}/tex/latex/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/contrib/hbname-u.tex \
-		${TEXMF_HLATEX}/tex/lambda/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/contrib/halpha.bst \
-		${TEXMF_HLATEX}/bibtex/bst/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/contrib/*.ist \
-		${TEXMF_HLATEX}/makeindex
-	${INSTALL_DATA} ${MACRO_DIR}/contrib/khyper.sty \
-		${TEXMF_HLATEX}/tex/latex/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/contrib/showhkeys.sty \
-		${TEXMF_HLATEX}/tex/latex/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/contrib/showhtags.sty \
-		${TEXMF_HLATEX}/tex/latex/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/contrib/hangulfn.sty \
-		${TEXMF_HLATEX}/tex/latex/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/contrib/hfn-k.tex \
-		${TEXMF_HLATEX}/tex/latex/hlatex
-	${INSTALL_DATA} ${MACRO_DIR}/contrib/hfn-u.tex \
-		${TEXMF_HLATEX}/tex/lambda/hlatex
-
-	# Part 3: binaries
-	${INSTALL_PROGRAM} ${MACRO_DIR}/contrib/hbibtex ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${MACRO_DIR}/contrib/hmakeindex ${PREFIX}/bin
-
-	# Part 4: fontmap
-	${INSTALL_DATA} ${FONT_DIR}/uhc-base.map \
-		${TEXMF_HLATEX}/fonts/map/hlatex
-	${INSTALL_DATA} ${FONT_DIR}/uhc-extra.map \
-		${TEXMF_HLATEX}/fonts/map/hlatex
-
-	# Part 5: documents and samples
-	for file in ${HLATEX_DOC_BASE}; \
-	do \
-		${INSTALL_DATA} \
-		  ${MACRO_DIR}/$$file ${TEXMF_HLATEX}/doc/latex/hlatex; \
-	done
-	for file in ${HLATEX_DOC_FONT_BASE}; \
-	do \
-		${INSTALL_DATA} \
-		  ${FONT_DIR}/$$file ${TEXMF_HLATEX}/doc/latex/hlatex/fonts; \
-	done
-
-	# Part 6: fonts
-	cd ${TEXMF_HLATEX}/fonts/; \
-	for fonts in ${HLATEX_FONTS_BASE}; \
-	do \
-		${EXTRACT_CMD} \
-			${EXTRACT_BEFORE_ARGS} \
-			${_DISTDIR}/$$fonts ${EXTRACT_AFTER_ARGS}; \
-	done
-
-	# Part 7: update texmf.cnf
-	${MV} ${TEXMF}/web2c/texmf.cnf ${TEXMF}/web2c/texmf.cnf.beforehlatex
-	${INSTALL_DATA} ${WRKDIR}/texmf.cnf ${TEXMF}/web2c
-	
-	# Part 8: rehash
-	${PREFIX}/bin/texhash
-
-.include <bsd.port.mk>
--- a/korean/hlatex/distinfo
+++ b/korean/hlatex/distinfo
@ -1,10 +0,0 @@
-SHA256 (hlatex/HLaTeX-1.0.1.tar.gz) = 457fad826daa75a3dd28cce519b1284ab7526072997e14973dedf771c428074b
-SIZE (hlatex/HLaTeX-1.0.1.tar.gz) = 1133770
-SHA256 (hlatex/uhc-fonts-1.0.tar.gz) = 85c1d83e0955a9276b1e78fb3fd73d0cbf09e5bb2925a1bddd4c103a6adef7b9
-SIZE (hlatex/uhc-fonts-1.0.tar.gz) = 987905
-SHA256 (hlatex/uhc-myoungjo-1.0.tar.gz) = e776bd739450d5544d500354d50404ac1a3386078bcc80ccc42cb9e66a8f2f0e
-SIZE (hlatex/uhc-myoungjo-1.0.tar.gz) = 10684150
-SHA256 (hlatex/uhc-gothic-1.0.tar.gz) = e8a9ef3492a2dfd533bec464a6f3830b361d2fca3d73a33c56d0e382a9ffb78e
-SIZE (hlatex/uhc-gothic-1.0.tar.gz) = 8467565
-SHA256 (hlatex/uhc-taza-1.0.tar.gz) = 40ae44cc0e526baa5c47417922dca3ba84715686ba3b818c66ae5869b3e7ecbe
-SIZE (hlatex/uhc-taza-1.0.tar.gz) = 1338672
--- a/korean/hlatex/pkg-descr
+++ b/korean/hlatex/pkg-descr
@ -1,15 +0,0 @@
-HLaTeX
-======
-
-This is a \TeX macro package to use Hangul with \LaTeX.
-With this package, you can run latex on UHC or UTF-8 based Korean LaTeX
-file to produce a professionally looking Korean documents. You can
-typeset all Korean characters defined in UHC and UTF-8, including Korean
-Symbol, Hangul and Hanja.
-
-UHC means Unified Hangul Code, Microsoft's own Hangul code including
-EUC-KR. UTF-8 means a kind of encoding form of Unicode. 
-
-Currently it can be used with Lambda/Omega. teTeX 3.0 and above includes them.
-
-WWW: http://project.ktug.or.kr/hlatex
--- a/korean/hlatex/pkg-plist
+++ b/korean/hlatex/pkg-plist
--- a/korean/johabfonts/Makefile
+++ b/korean/johabfonts/Makefile
@ -1,36 +0,0 @@
-# New ports collection makefile for:	johabfonts
-# Date created:		15 Mar 1998
-# Whom:			CHOI Junho <junker@jazz.snu.ac.kr>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	johabfonts
-PORTVERSION=	3.1
-PORTREVISION=	2
-CATEGORIES=	korean x11-fonts
-MASTER_SITES=	http://hanterm.org/download/font/
-DISTNAME=	hanterm-font-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Hangul fonts for X11(johab) used in many hangul-related programs
-
-# Depended on by korean/hanterm
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-10-31
-
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
-BROKEN=		installs into /
-
-USE_IMAKE=	yes
-
-NO_INSTALL_MANPAGES= yes
-WRKSRC=		${WRKDIR}/hanterm-font/10-6-6
-
-pre-install:
-	-${MKDIR} ${PREFIX}/lib/X11/fonts/local
-
-.include <bsd.port.mk>
--- a/korean/johabfonts/distinfo
+++ b/korean/johabfonts/distinfo
@ -1,2 +0,0 @@
-SHA256 (hanterm-font-3.1.tar.gz) = 6986e50f75100cb7d9ce628074740290205cc163a274f7dcb16720d33df21169
-SIZE (hanterm-font-3.1.tar.gz) = 2486571
--- a/korean/johabfonts/files/patch-aa
+++ b/korean/johabfonts/files/patch-aa
@ -1,15 +0,0 @@
--- Imakefile.orig	Sat Mar 16 04:27:42 1996
-+++ Imakefile	Tue Nov 17 12:53:05 1998
-@@ -22,10 +22,10 @@
- 
- MakeFontsDir($(HAN_PCF_FONTS))
- 
-InstallFontObjs($(HAN_PCF_FONTS), $(FONTDIR)/misc)
-+InstallFontObjs($(HAN_PCF_FONTS), $(FONTDIR)/local)
- 
- install::
-	cd $(FONTDIR)/misc; mkfontdir
-+	cd $(FONTDIR)/local; mkfontdir
- clean::
- 	$(RM) $(HAN_PCF_FONTS)
- 
--- a/korean/johabfonts/pkg-descr
+++ b/korean/johabfonts/pkg-descr
@ -1,7 +0,0 @@
-Hangul X11 fonts(Johab)
-----------------------
-
-It is Korean fonts for X11, used in hanterm, hanemacs, mozilla, etc.
-Its encoding is not standard(-johab*), so it cannot be used in i18n-ed 
-program of X11. But Mozilla(open source netscape web browser) can use 
-these fonts for displaying.
--- a/korean/johabfonts/pkg-message
+++ b/korean/johabfonts/pkg-message
@ -1,20 +0,0 @@
-Hangul X11 fonts(Johab)
-----------------------
-
-Please note:
-
- This package installed fonts in /usr/X11R6/lib/X11/fonts/local directory.
- If you are using XFree86 3.3.2 or older, please upgrade to a new version
- or add this directory to your /etc/XF86Config:
-
- Section "Files"
-     ...
-     FontPath   "/usr/X11R6/lib/X11/fonts/local/"
-     ...
-
- Or, run this command at your X desktop:
-
- # xset +fp /usr/X11R6/lib/X11/fonts/local/ && xset fp rehash
-
- Don't forget to add the directory to your /etc/XF86Config, for
- add the correct font path after you reboots X.
--- a/korean/johabfonts/pkg-plist
+++ b/korean/johabfonts/pkg-plist
@ -1,14 +0,0 @@
-lib/X11/fonts/local/iyagi16.pcf.gz
-lib/X11/fonts/local/iyagis16.pcf.gz
-lib/X11/fonts/local/johabg16.pcf.gz
-lib/X11/fonts/local/johabm16.pcf.gz
-lib/X11/fonts/local/johabp16.pcf.gz
-lib/X11/fonts/local/johabshg16.pcf.gz
-lib/X11/fonts/local/johabshm16.pcf.gz
-lib/X11/fonts/local/johabshp16.pcf.gz
-lib/X11/fonts/local/johabsg16.pcf.gz
-lib/X11/fonts/local/johabsm16.pcf.gz
-lib/X11/fonts/local/johabsp16.pcf.gz
-@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
--- a/korean/texinfo/Makefile
+++ b/korean/texinfo/Makefile
@ -1,47 +0,0 @@
-# New ports collection makefile for:    texinfo
-# Date created:         25 Sep 2000
-# Whom:                 cjh
-#
-# $FreeBSD$
-#
-
-PORTNAME=	texinfo
-PORTVERSION=	0.4.1
-PORTREVISION=	10
-CATEGORIES=	korean print
-MASTER_SITES=	ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
-DISTNAME=	${PORTNAME}-ko-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Korean enabled Texinfo formatter
-
-DEPRECATED=	Depends on korean/hlatex, which is DEPRECATED
-EXPIRATION_DATE=	2011-10-31
-
-RUN_DEPENDS=	hbibtex:${PORTSDIR}/korean/hlatex
-
-GNU_CONFIGURE=	YES
-USE_GETTEXT=	yes
-USE_GMAKE=	YES
-
-# local variables.
-TEXMF=		${PREFIX}/share/texmf
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/texinfo-ko.tex \
-			${WRKSRC}/doc/texinfo-ko-HLaTeX.tex \
-			${TEXMF}/tex/texinfo
-	${INSTALL_PROGRAM} ${WRKSRC}/util/texindex \
-			${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/makeinfo/makeinfo \
-			${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/doc/texinfo-ko
-	${INSTALL_DATA} ${WRKSRC}/README.ko \
-			${WRKSRC}/NEWS.ko \
-			${WRKSRC}/TODO.ko \
-			${PREFIX}/share/doc/texinfo-ko
-
-post-install:
-	${PREFIX}/bin/texhash
-
-.include <bsd.port.mk>
--- a/korean/texinfo/distinfo
+++ b/korean/texinfo/distinfo
@ -1,2 +0,0 @@
-SHA256 (texinfo-ko-0.4.1.tar.gz) = 85da48d81c7a7ece0f0ac3da40abb292c96f76e9539277148cfcda841a03e62d
-SIZE (texinfo-ko-0.4.1.tar.gz) = 822107
--- a/korean/texinfo/pkg-descr
+++ b/korean/texinfo/pkg-descr
@ -1,11 +0,0 @@
-  Texinfo is a documentation system that uses a single source file to
-produce both online information and printed output.
-
-  Texinfo-ko is a Korean patched version of Texinfo formatter.  It
-enables users to write a Korean Texinfo document with EUC-KR
-encoded Hangul.
-
-  Texinfo-ko includes makeinfo (info formatter), texinfo-ko.tex (TeX
-formatter), and texindex.
-
-  Korean Texinfo system by Changwoo Ryu <cwryu@debian.org>
--- a/korean/texinfo/pkg-plist
+++ b/korean/texinfo/pkg-plist
@ -1,11 +0,0 @@
-bin/makeinfo
-bin/texindex
-share/doc/texinfo-ko/NEWS.ko
-share/doc/texinfo-ko/README.ko
-share/doc/texinfo-ko/TODO.ko
-share/texmf/tex/texinfo/texinfo-ko-HLaTeX.tex
-share/texmf/tex/texinfo/texinfo-ko.tex
-@dirrm share/doc/texinfo-ko
-@comment to safely execute texhash
-@exec env PATH=%D/bin:$PATH %D/bin/texhash
-@unexec env PATH=%D/bin:$PATH %D/bin/texhash
--- a/mail/Makefile
+++ b/mail/Makefile
@ -212,7 +212,6 @@
    SUBDIR += itraxp
    SUBDIR += james
    SUBDIR += jamlib
-    SUBDIR += jboss-mailservices
    SUBDIR += jmba
    SUBDIR += junkfilter
    SUBDIR += kavmilter
--- a/mail/jboss-mailservices/Makefile
+++ b/mail/jboss-mailservices/Makefile
@ -1,43 +0,0 @@
-# New ports collection makefile for:    JBoss Mail Services
-# Date created:		Thu Jan  6 13:39:18 EET 2005
-# Whom:			Anton Yudin <toha@toha.org.ua>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	jboss-mailservices
-PORTVERSION=	m1
-PORTREVISION=	2
-CATEGORIES=	mail java
-MASTER_SITES=	http://www.jboss.org/wiki/attach?page=MailServicesMilestoneReleases/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-final
-
-MAINTAINER=	toha@toha.org.ua
-COMMENT=	JBoss Mail Services
-
-DEPRECATED=	Depends on java/jboss4, which is DEPRECATED
-EXPIRATION_DATE=	2011-10-31
-
-RUN_DEPENDS=	${LOCALBASE}/jboss4/server/default/conf/jboss-service.xml:${PORTSDIR}/java/jboss4
-
-USE_JAVA=	YES
-JAVA_VERSION=	1.5+
-NO_BUILD=	YES
-USE_ZIP=	YES
-
-DEPLOY_PATH=	${LOCALBASE}/jboss4/server/default/deploy
-WRKSRC=		${WRKDIR}/deploy
-
-.include <bsd.port.pre.mk>
-
-do-install:
-	cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL} -d ${DEPLOY_PATH}/'{}' \; && \
-	${FIND} . -type f -exec ${INSTALL_DATA} '{}' ${DEPLOY_PATH}/'{}' \;
-
-post-install:
-	@${FIND} -s ${WRKSRC}/mail.ear -not -type d 2>/dev/null | \
-		${SED} -ne 's,^${WRKSRC},${DEPLOY_PATH:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s -d ${WRKSRC}/mail.ear -type d 2>/dev/null | \
-		${SED} -ne 's,^${WRKSRC},@dirrm ${DEPLOY_PATH:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-
-.include <bsd.port.post.mk>
--- a/mail/jboss-mailservices/distinfo
+++ b/mail/jboss-mailservices/distinfo
@ -1,2 +0,0 @@
-SHA256 (jboss-mailservices-m1-final.zip) = a54a3cac61c1fe5c6224a8aa28fe5d84d7f55838e31c41cf0b80afedb1e72af0
-SIZE (jboss-mailservices-m1-final.zip) = 1291084
--- a/mail/jboss-mailservices/pkg-descr
+++ b/mail/jboss-mailservices/pkg-descr
@ -1,21 +0,0 @@
-JBossMail was created to enable JBoss to serve as an email server.
-
-JBossMail currently consists of:
-
-    * Core Server - which provides thread pooling, connection handling, and
-      timeout configuration.
-    * POP Protocol Implementation - plugs into the Server MBean to provide a
-      POP implementation.
-    * SMTP Server - plugs into the Server MBean to provide an SMTP protocol
-      implementation.
-    * Mail Listeners - plug into the SMTP server to forward mail to the various
-      backends. Currently the JMSMailListener is provided. It forwards mails
-      to various JBossMQ queues. Message Driven Beans for remote and local
-      delivery are also provided.
-    * Mailbox implementations - provides backends to the mail server. Presently
-      an EJB Entity-based version is provided.
-    * SMTPSender - uses JavaMail to mail messages to remote servers
-    * Test suite - JUnit tests for the various portions of mail services.
-      Includes a few services including mock-jndi.
-
-WWW: http://www.jboss.org/products/mailservices
--- a/misc/Makefile
+++ b/misc/Makefile
@ -418,8 +418,6 @@
    SUBDIR += p5-Geo-Postcodes-NO
    SUBDIR += p5-Geo-Weather
    SUBDIR += p5-Geography-Countries
-    SUBDIR += p5-Geography-NationalGrid
-    SUBDIR += p5-Geography-NationalGrid-TW
    SUBDIR += p5-I18N-Charset
    SUBDIR += p5-I18N-LangTags
    SUBDIR += p5-LEGO-RCX
--- a/misc/p5-Geography-NationalGrid-TW/Makefile
+++ b/misc/p5-Geography-NationalGrid-TW/Makefile
@ -1,28 +0,0 @@
-# New ports collection makefile for:	misc/p5-Geography-NationalGrid-TW
-# Date created:				2007/03/20
-# Whom:					chinsan
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Geography-NationalGrid-TW
-PORTVERSION=	0.08
-CATEGORIES=	misc perl5 geography
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:LEEYM
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Convert Taiwan Datum (TWD67/TM2, TWD97/TM2) to/from Lat and Long
-
-DEPRECATED=	Depends on misc/p5-Geography-NationalGrid, which is DEPRECATED
-EXPIRATION_DATE=	2011-10-31
-
-BUILD_DEPENDS=	p5-Geography-NationalGrid>=0:${PORTSDIR}/misc/p5-Geography-NationalGrid
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		Geography::NationalGrid::TW.3
-
-.include <bsd.port.mk>
--- a/misc/p5-Geography-NationalGrid-TW/distinfo
+++ b/misc/p5-Geography-NationalGrid-TW/distinfo
@ -1,2 +0,0 @@
-SHA256 (Geography-NationalGrid-TW-0.08.tar.gz) = 521b3f5b5690d73d9d558c9a1964e0ae39275c46fd72143d1dcb6b31cd89c2be
-SIZE (Geography-NationalGrid-TW-0.08.tar.gz) = 5718
--- a/misc/p5-Geography-NationalGrid-TW/pkg-descr
+++ b/misc/p5-Geography-NationalGrid-TW/pkg-descr
@ -1,4 +0,0 @@
-Geography::NationalGrid::TW - Module to convert Taiwan Datum (TWD67/TM2,
-TWD97/TM2) to/from Latitude and Longitude
-
-WWW: http://search.cpan.org/dist/Geography-NationalGrid-TW/
--- a/misc/p5-Geography-NationalGrid-TW/pkg-plist
+++ b/misc/p5-Geography-NationalGrid-TW/pkg-plist
@ -1,7 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/NationalGrid/TW/.packlist
-%%SITE_PERL%%/Geography/NationalGrid/TW.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/NationalGrid/TW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/NationalGrid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography
-@dirrmtry %%SITE_PERL%%/Geography/NationalGrid
-@dirrmtry %%SITE_PERL%%/Geography
--- a/misc/p5-Geography-NationalGrid/Makefile
+++ b/misc/p5-Geography-NationalGrid/Makefile
@ -1,26 +0,0 @@
-# New ports collection makefile for:	misc/p5-Geography-NationalGrid
-# Date created:				2007/03/20
-# Whom:					chinsan
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Geography-NationalGrid
-PORTVERSION=	1.6
-CATEGORIES=	misc perl5 geography
-MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Create an object for a point and to transform coordinate systems
-
-# Depended on by misc/p5-Geography-NationalGrid-TW
-DEPRECATED=	Disappeared from CPAN
-EXPIRATION_DATE=	2011-10-31
-
-PERL_CONFIGURE=	yes
-
-MAN3=		Geography::NationalGrid.3 Geography::NationalGrid::GB.3 \
-		Geography::NationalGrid::IE.3
-
-.include <bsd.port.mk>
--- a/misc/p5-Geography-NationalGrid/distinfo
+++ b/misc/p5-Geography-NationalGrid/distinfo
@ -1,2 +0,0 @@
-SHA256 (Geography-NationalGrid-1.6.tar.gz) = 8681495708d9147898feaf65ed380095989794921b296c3b9fdf1b18d895c0f7
-SIZE (Geography-NationalGrid-1.6.tar.gz) = 13029
--- a/misc/p5-Geography-NationalGrid/pkg-descr
+++ b/misc/p5-Geography-NationalGrid/pkg-descr
@ -1,6 +0,0 @@
-Geography::NationalGrid is a factory class whose sole purpose is to give you
-an object for the right country. Geography::NationalGrid::GB and
-Geography::NationalGrid::IE are included with this distribution - other
-countries' national grids are converted by other packages.
-
-WWW: http://search.cpan.org/dist/Geography-NationalGrid/
--- a/misc/p5-Geography-NationalGrid/pkg-plist
+++ b/misc/p5-Geography-NationalGrid/pkg-plist
@ -1,8 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/NationalGrid/.packlist
-%%SITE_PERL%%/Geography/NationalGrid.pm
-%%SITE_PERL%%/Geography/NationalGrid/IE.pm
-%%SITE_PERL%%/Geography/NationalGrid/GB.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/NationalGrid
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography
-@dirrmtry %%SITE_PERL%%/Geography/NationalGrid
-@dirrmtry %%SITE_PERL%%/Geography
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@ -65,7 +65,6 @@
    SUBDIR += fpc-dts
    SUBDIR += fpc-matroska
    SUBDIR += freevo
-    SUBDIR += fxtv
    SUBDIR += gaupol
    SUBDIR += gavl
    SUBDIR += gcap
@ -220,7 +219,6 @@
    SUBDIR += mplayer-fonts
    SUBDIR += mplayer-skins
    SUBDIR += mplayerxp
-    SUBDIR += mplex
    SUBDIR += msdl
    SUBDIR += mxflib
    SUBDIR += mythplugin-mythvideo
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@ -1,48 +0,0 @@
-# New ports collection makefile for:	fxtv
-# Date created:		Thu Nov  4 19:54:04 EST 1999
-# Whom:			Randall Hopper <aa8vb@nc.rr.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	fxtv
-PORTVERSION=	1.03
-PORTREVISION=	11
-CATEGORIES=	multimedia
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	rhh
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	X-based TV Display and Capture Application (for use with bt848 driver)
-
-DEPRECATED=	Depends on multimedia/mplex, which is DEPRECATED
-EXPIRATION_DATE=	2011-10-31
-
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-
-USE_XORG=	ice sm x11 xaw xext xmu xt xpm xxf86vm xxf86dga
-USE_GMAKE=	yes
-MAKE_FLAGS=	-e
-MAN1=		fxtv.1
-
-ONLY_FOR_ARCHS=	alpha i386 ia64 amd64
-
-OPTIONS=	EXTRA "Extra programs required to record/playback/save" off
-
-.include <bsd.port.pre.mk>
-
-# This program does not actually require the programs below unless you
-#   use audio/video recording and/or playback and save to a non-raw format.
-.if defined(WITH_EXTRA)
-RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox \
-		mpg123:${PORTSDIR}/audio/mpg123 \
-		mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
-		mplex:${PORTSDIR}/multimedia/mplex
-.endif
-
-pre-install:
-	${CP} ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man
-
-.include <bsd.port.post.mk>
--- a/multimedia/fxtv/distinfo
+++ b/multimedia/fxtv/distinfo
@ -1,2 +0,0 @@
-SHA256 (fxtv-1.03.tgz) = 17e256afe895b2294cdaeb6fe8461d8869cc458687a4ea8895f8b16b5e85cc82
-SIZE (fxtv-1.03.tgz) = 198669
--- a/multimedia/fxtv/files/patch-ab
+++ b/multimedia/fxtv/files/patch-ab
@ -1,11 +0,0 @@
--- Makefile.orig	Tue Feb 13 09:08:59 2001
-+++ Makefile	Sat Mar 10 17:36:25 2001
-@@ -62,7 +62,7 @@
- ifneq ($(DEBUG),NO)
-   override CFLAGS          = -DDEBUG -g
- else
-  override CFLAGS          = -DNDEBUG -O2
-+  override CFLAGS          += -DNDEBUG #-O2
- endif
- C_WARN_FLAG                = -Wall
- override CFLAGS           += $(C_WARN_FLAG) $(INC) $(CF_VERS)
--- a/multimedia/fxtv/files/patch-ac
+++ b/multimedia/fxtv/files/patch-ac
@ -1,11 +0,0 @@
--- videolib/Makefile.orig	Tue Feb 13 06:04:45 2001
-+++ videolib/Makefile	Sat Mar 10 17:39:59 2001
-@@ -15,7 +15,7 @@
- ifneq ($(DEBUG),NO)
-   override CFLAGS          = -DDEBUG -g
- else
-  override CFLAGS          = -DNDEBUG -O2
-+  override CFLAGS          += -DNDEBUG #-O2
- endif
- C_WARN_FLAG                = -Wall
- override CFLAGS           += $(C_WARN_FLAG) $(INC)
--- a/multimedia/fxtv/files/patch-ad
+++ b/multimedia/fxtv/files/patch-ad
@ -1,13 +0,0 @@
--- voxware.h.orig	Sat Sep  7 16:51:45 2002
-+++ voxware.h	Sat Sep  7 16:51:58 2002
-@@ -30,9 +30,7 @@
- #ifndef __VOXWARE_H
- #define __VOXWARE_H
- 
-#if defined(__FreeBSD__)
-#  include <machine/soundcard.h>
-#elif defined(linux) || defined(__bsdi__)
-+#if defined(linux) || defined(__bsdi__) || defined(__FreeBSD__)
- #  include <sys/soundcard.h>
- #elif defined(__NetBSD__) || defined(__OpenBSD__)
- #  include <soundcard.h>
--- a/multimedia/fxtv/files/patch-ae
+++ b/multimedia/fxtv/files/patch-ae
@ -1,11 +0,0 @@
--- remote.c.orig	Sat Sep  7 16:54:12 2002
-+++ remote.c	Sat Sep  7 16:54:24 2002
-@@ -65,7 +65,7 @@
- /*      ******************** Local defines                ************** */
- 
- /*  FIXME: Remove this old code someday  */
-#ifdef 0
-+#if 0
- #  define OLD_DEV_SYSMOUSE_STUFF
- #endif
- 
--- a/multimedia/fxtv/files/patch-app_rsrc.h
+++ b/multimedia/fxtv/files/patch-app_rsrc.h
@ -1,188 +0,0 @@
--- app_rsrc.h.orig	2001-02-12 22:17:53.000000000 +0100
-+++ app_rsrc.h
-@@ -525,96 +525,95 @@ static XtResource Resources[] = {
- };
- 
- 
-#define OPTION_HELP_STR "\
-                      BSD X TV (fxtv), Version " VERS_STR ".  
-                         Written by Randall Hopper
-
-Please mail Fxtv and Bt848 driver-related comments and help requests to the
-multimedia@freebsd.org list.  Feel free to subscribe and contribute 
-(listserv: majordomo@freebsd.org).
-
-Available options:
-
--driverDefaults             - Use appearance parms from driver on startup
--colorbars                  - Turn on colorbar display (for testing)
--hue [-90...90]             - Initial Hue           ; def=0
--brightness [-50..50]       - Initial Brightness (%); def=0
--contrast [0..200]          - Initial Contrast   (%); def=100
--satU [0..200]              - U Saturation       (%); def=100
--satV [0..284]              - V Saturation       (%); def=100
--aspectlock                 - Enable 4:3 aspect lock on video window
-
--deviceNumber <#>           - bktr/tuner device numbers; def=0      
--inputFormat <fmt>          - Tuner signal input format (ntsc,ntscm,ntscj,
-                                 palbdghi,pal,palm,paln,secam,palncomb,rsvd)
-
--tunerMode [cable|antenna]  - Tuner Mode
--defaultInput <input>       - Startup tuner signal input 
-                                 [tuner|video|svideo|csvideo|dev3]
--defaultAudioInput <input>  - Startup TV card audio input 
-                                 [tuner|external|internal|auto]
--defaultChannel <#>         - Startup Channel Number
--cableStationList   <...>   - List of cable station presets (see rsrc file)
--antennaStationList <...>   - List of antenna station presets
--cableFreqSet   <freqset>   - Freq set for cable   (def = cableirc)
-                              [nabcst|cableirc|cablehrc|weurope|jpnbcst|
-                               jpncable|xussr|australia|france]
--antennaFreqSet <freqset>   - Freq set for antenna (def = nabcst)
-
--noAudio                    - Suppress playing audio through soundcard
--dspDevice                  - Override default DSP device   (def=/dev/dsp)
--mixerDevice                - Override default mixer device (def=/dev/mixer)
--mixerChannel               - Audio mixer (line,line1/2/3,cd,mic,video)
-
--stationInWinTitle          - Display station text in window title
--stationInWinIcon           - Display station text in window icon
-
--stationAnnotFont <fontpat> - Font pattern for station annot (see rsrc file)
--stationAnnotColor <color>  - Color for station annot
--stationAnnotDelay <msec>   - How long to display (0 = never; -1 = always)
--stationAnnotIDOnly         - Display station ID alone (when available)
-
--tunerModeAnnot{Font,Color,Delay}
--inputDevAnnot{Font,Color,Delay}
--volumeDevAnnot{Font,Color,Delay}
--muteDevAnnot{Font,Color,Delay}
-                            - Other annotation options (see stationAnnot)
-
--remoteType                 - Type of attached remote control 
-                              [None|X10|Hauppauge|PixelView]
-
--recCmdMpeg2                - MPEG-2 Audio record command 
--recCmdMpeg3                - MPEG-3 Audio record command
--playCmdMpeg2               - MPEG-2 Audio play   command
--playCmdMpeg3               - MPEG-3 Audio play   command
-
--videoCnvtScript            - Video conversion workhorse script for vid encod.
-
--bswap2Bpp                  - Byte/word swap options for direct video
--nobswap2Bpp                  (used to match driver's pixel format with
--bswap3Bpp                    the video card's)
--nobswap3Bpp
--bswap4Bpp                        2Bpp - 15/16-bpp modes
--nobswap4Bpp                      3Bpp - packed 24bpp modes
--bwwap4Bpp                        4Bpp - unpacked 24bpp modes
--nowswap4Bpp
-
--Bpp24bit [3|4]             - Set frame buffer Bytes-per-pixel for 24bpp mode
--Bpp32bit [3|4]             - Set frame buffer Bytes-per-pixel for 32bpp mode
-
--videoCapFile[1-4]          - Optional paths (0-4) to scratch file paths to 
-                              use for video capture; spreads load across disks
-
--noafc                      - Disable AFC
--disableDirectV             - Disable DMA transfers straight to video card
--debug <area>               - Debug Msgs 
-                              {startup,driver,subproc,events,video,frame}
--help                       - Display program options
-
-NOTE:  All command line options are accessible as X resources as well.
-       The X resources have the same names as the command-line options.
-       See the sample Fxtv class resource file for details.
-"
-+#define OPTION_HELP_STR \
-+"                      BSD X TV (fxtv), Version " VERS_STR ".\n" \
-+"                         Written by Randall Hopper\n" \
-+"\n" \
-+"Please mail Fxtv and Bt848 driver-related comments and help requests to the\n" \
-+"multimedia@freebsd.org list.  Feel free to subscribe and contribute\n" \
-+"(listserv: majordomo@freebsd.org).\n" \
-+"\n" \
-+"Available options:\n" \
-+"\n" \
-+"-driverDefaults             - Use appearance parms from driver on startup\n" \
-+"-colorbars                  - Turn on colorbar display (for testing)\n" \
-+"-hue [-90...90]             - Initial Hue           ; def=0\n" \
-+"-brightness [-50..50]       - Initial Brightness (%); def=0\n" \
-+"-contrast [0..200]          - Initial Contrast   (%); def=100\n" \
-+"-satU [0..200]              - U Saturation       (%); def=100\n" \
-+"-satV [0..284]              - V Saturation       (%); def=100\n" \
-+"-aspectlock                 - Enable 4:3 aspect lock on video window\n" \
-+"\n" \
-+"-deviceNumber <#>           - bktr/tuner device numbers; def=0\n" \
-+"-inputFormat <fmt>          - Tuner signal input format (ntsc,ntscm,ntscj,\n" \
-+"                                 palbdghi,pal,palm,paln,secam,palncomb,rsvd)\n" \
-+"\n" \
-+"-tunerMode [cable|antenna]  - Tuner Mode\n" \
-+"-defaultInput <input>       - Startup tuner signal input\n" \
-+"                                 [tuner|video|svideo|csvideo|dev3]\n" \
-+"-defaultAudioInput <input>  - Startup TV card audio input\n" \
-+"                                 [tuner|external|internal|auto]\n" \
-+"-defaultChannel <#>         - Startup Channel Number\n" \
-+"-cableStationList   <...>   - List of cable station presets (see rsrc file)\n" \
-+"-antennaStationList <...>   - List of antenna station presets\n" \
-+"-cableFreqSet   <freqset>   - Freq set for cable   (def = cableirc)\n" \
-+"                              [nabcst|cableirc|cablehrc|weurope|jpnbcst|\n" \
-+"                               jpncable|xussr|australia|france]\n" \
-+"-antennaFreqSet <freqset>   - Freq set for antenna (def = nabcst)\n" \
-+"\n" \
-+"-noAudio                    - Suppress playing audio through soundcard\n" \
-+"-dspDevice                  - Override default DSP device   (def=/dev/dsp)\n" \
-+"-mixerDevice                - Override default mixer device (def=/dev/mixer)\n" \
-+"-mixerChannel               - Audio mixer (line,line1/2/3,cd,mic,video)\n" \
-+"\n" \
-+"-stationInWinTitle          - Display station text in window title\n" \
-+"-stationInWinIcon           - Display station text in window icon\n" \
-+"\n" \
-+"-stationAnnotFont <fontpat> - Font pattern for station annot (see rsrc file)\n" \
-+"-stationAnnotColor <color>  - Color for station annot\n" \
-+"-stationAnnotDelay <msec>   - How long to display (0 = never; -1 = always)\n" \
-+"-stationAnnotIDOnly         - Display station ID alone (when available)\n" \
-+"\n" \
-+"-tunerModeAnnot{Font,Color,Delay}\n" \
-+"-inputDevAnnot{Font,Color,Delay}\n" \
-+"-volumeDevAnnot{Font,Color,Delay}\n" \
-+"-muteDevAnnot{Font,Color,Delay}\n" \
-+"                            - Other annotation options (see stationAnnot)\n" \
-+"\n" \
-+"-remoteType                 - Type of attached remote control\n" \
-+"                              [None|X10|Hauppauge|PixelView]\n" \
-+"\n" \
-+"-recCmdMpeg2                - MPEG-2 Audio record command\n" \
-+"-recCmdMpeg3                - MPEG-3 Audio record command\n" \
-+"-playCmdMpeg2               - MPEG-2 Audio play   command\n" \
-+"-playCmdMpeg3               - MPEG-3 Audio play   command\n" \
-+"\n" \
-+"-videoCnvtScript            - Video conversion workhorse script for vid encod.\n" \
-+"\n" \
-+"-bswap2Bpp                  - Byte/word swap options for direct video\n" \
-+"-nobswap2Bpp                  (used to match driver's pixel format with\n" \
-+"-bswap3Bpp                    the video card's)\n" \
-+"-nobswap3Bpp\n" \
-+"-bswap4Bpp                        2Bpp - 15/16-bpp modes\n" \
-+"-nobswap4Bpp                      3Bpp - packed 24bpp modes\n" \
-+"-bwwap4Bpp                        4Bpp - unpacked 24bpp modes\n" \
-+"-nowswap4Bpp\n" \
-+"\n" \
-+"-Bpp24bit [3|4]             - Set frame buffer Bytes-per-pixel for 24bpp mode\n" \
-+"-Bpp32bit [3|4]             - Set frame buffer Bytes-per-pixel for 32bpp mode\n" \
-+"\n" \
-+"-videoCapFile[1-4]          - Optional paths (0-4) to scratch file paths to\n" \
-+"                              use for video capture; spreads load across disks\n" \
-+"\n" \
-+"-noafc                      - Disable AFC\n" \
-+"-disableDirectV             - Disable DMA transfers straight to video card\n" \
-+"-debug <area>               - Debug Msgs\n" \
-+"                              {startup,driver,subproc,events,video,frame}\n" \
-+"-help                       - Display program options\n" \
-+"\n" \
-+"NOTE:  All command line options are accessible as X resources as well.\n" \
-+"       The X resources have the same names as the command-line options.\n" \
-+"       See the sample Fxtv class resource file for details.\n"
- 
- static String fallback_resources[] = { 
-  /*"Fxtv.geometry: +10+10",*/
--- a/multimedia/fxtv/files/patch-haup__remote.c
+++ b/multimedia/fxtv/files/patch-haup__remote.c
@ -1,24 +0,0 @@
-
-$FreeBSD$
-
--- haup_remote.c.orig
-+++ haup_remote.c
-@@ -38,9 +38,16 @@
- #include <sys/fcntl.h>
- #ifdef __NetBSD__
- # include <dev/ic/bt8xx.h>
-+#endif
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#if __FreeBSD_version > 500000
-+#include <dev/bktr/ioctl_meteor.h>
-+#include <dev/bktr/ioctl_bt848.h>
- #else
-# include <machine/ioctl_meteor.h>
-# include <machine/ioctl_bt848.h>
-+#include <machine/ioctl_bt848.h>
-+#include <machine/ioctl_meteor.h>
-+#endif
- #endif
- #include "haup_remote.h"
- 
--- a/multimedia/fxtv/files/patch-pixelview__remote.c
+++ b/multimedia/fxtv/files/patch-pixelview__remote.c
@ -1,24 +0,0 @@
-
-$FreeBSD$
-
--- pixelview_remote.c.orig
-+++ pixelview_remote.c
-@@ -39,9 +39,16 @@
- #include <sys/fcntl.h>
- #ifdef __NetBSD__
- # include <dev/ic/bt8xx.h>
-+#endif
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#if __FreeBSD_version > 500000
-+#include <dev/bktr/ioctl_bt848.h>
-+#include <dev/bktr/ioctl_meteor.h>
- #else
-# include <machine/ioctl_meteor.h>
-# include <machine/ioctl_bt848.h>
-+#include <machine/ioctl_meteor.h>
-+#include <machine/ioctl_bt848.h>
-+#endif
- #endif
- #include "pixelview_remote.h"
- 
--- a/multimedia/fxtv/files/patch-tvcapture.c
+++ b/multimedia/fxtv/files/patch-tvcapture.c
@ -1,25 +0,0 @@
-
-$FreeBSD$
-
--- tvcapture.c.orig
-+++ tvcapture.c
-@@ -34,11 +34,18 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/mman.h>
- #ifdef __NetBSD__
- # include <dev/ic/bt8xx.h>
-+#endif
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#if __FreeBSD_version > 500000
-+#include <dev/bktr/ioctl_bt848.h>
- #else
-# include <machine/ioctl_bt848.h>
-+#include <machine/ioctl_bt848.h>
-+#endif
- #endif
- #include <signal.h>
- #include <sys/ioctl.h>
--- a/multimedia/fxtv/files/patch-tvcapture.h
+++ b/multimedia/fxtv/files/patch-tvcapture.h
@ -1,21 +0,0 @@
-
-$FreeBSD$
-
--- tvcapture.h.orig
-+++ tvcapture.h
-@@ -34,8 +34,14 @@
- #include <X11/Intrinsic.h>
- #ifdef __NetBSD__
- # include <dev/ic/bt8xx.h>
-+#endif
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#if __FreeBSD_version > 500000
-+#include <dev/bktr/ioctl_meteor.h>
- #else
-# include <machine/ioctl_meteor.h>
-+#include <machine/ioctl_meteor.h>
-+#endif
- #endif
- #include "tvtypes.h"
- 
--- a/multimedia/fxtv/files/patch-tvmenu.c
+++ b/multimedia/fxtv/files/patch-tvmenu.c
@ -1,20 +0,0 @@
--- tvmenu.c.orig	Mon Feb 12 22:19:33 2001
-+++ tvmenu.c	Sun Nov 27 01:55:24 2005
-@@ -552,7 +552,7 @@
-     Widget popup_win, new_popup_item = NULL;
-     Cardinal num_children, i;
-     WidgetList children;
-    String actual_station, temp_station;
-+    String actual_station = NULL, temp_station = NULL;
- #ifdef FIXME
-     Pixmap pix;
- #endif
-@@ -589,7 +589,7 @@
- 
-         XtVaSetValues(children[i], XtNleftBitmap, pix, NULL);
- #else
-        if ( strcmp( actual_station, temp_station ) == 0 )
-+        if ( strcmp( actual_station==NULL ? "" : actual_station, temp_station==NULL ? "" : temp_station ) == 0 )
-             new_popup_item = children[i];
- #endif
-     }
--- a/multimedia/fxtv/files/patch-tvscreen.c
+++ b/multimedia/fxtv/files/patch-tvscreen.c
@ -1,13 +0,0 @@
--- tvscreen.c.ORI	Sun May 21 15:49:47 2000
-+++ tvscreen.c	Wed Jun  7 10:19:30 2006
-@@ -480,6 +480,9 @@
-     dga_avail = FALSE;
- 
- #ifdef HAVE_XFREE86
-+    if ( App_res.disable_direct_v )
-+        SUPRINTF(( "Will not init DGA since -disableDirectV was given.\n" ));
-+    else
-     if ( !XUTILXServerIsLocal( TVDISPLAY ) )
-         SUPRINTF(( "XF86DGA not available...X Server isn't local.\n" ));
-     else {
-
--- a/multimedia/fxtv/files/patch-videolib_videolib.c
+++ b/multimedia/fxtv/files/patch-videolib_videolib.c
@ -1,38 +0,0 @@
--- videolib/videolib.c.orig	1999-11-03 03:22:04.000000000 +0100
-+++ videolib/videolib.c	2007-09-05 18:31:05.000000000 +0200
-@@ -479,9 +479,8 @@
-             *(p++) = (*src16 >> 8) | (*src16 << 8);
-             src16++;
-           }
-          for ( i = dst_line_pad; i > 0; i-- )
-            *(((VL_UINT8 *)p)++) = 0x00;
-          (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
-+          memset(p, 0, dst_line_pad);
-+          dst_line += dst->geom.bytes_per_line / sizeof(VL_UINT16);
-         }
- 
-         src16 = dst_line = (VL_UINT16 *) dst->buf;
-@@ -513,9 +512,9 @@
-         if ( src_padded ) 
-           src16 = (VL_UINT16 *)( (VL_UINT8 *)src16 + dst_line_pad );
-         else
-          for ( i = dst_line_pad; i > 0; i-- )
-            *(((VL_UINT8 *)dst)++) = 0x00;
-        (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
-+          memset(dst, 0, dst_line_pad);
-+          dst += dst_line_pad / sizeof(VL_IMAGE);
-+          dst_line += dst->geom.bytes_per_line / sizeof(VL_UINT16);
-       }
- 
-       if ( !dst_swap_b ) {                       /*  More ugliness  */
-@@ -527,8 +526,8 @@
-             *(p++) = (*src16 >> 8) | (*src16 << 8);
-             src16++;
-           }
-          (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
-          (VL_UINT8 *)src16    += dst->geom.bytes_per_line;
-+          dst_line += dst->geom.bytes_per_line / sizeof(VL_UINT16);
-+          src16    += dst->geom.bytes_per_line / sizeof(VL_UINT16);
-         }
-       }
-     }
--- a/multimedia/fxtv/files/patch-xutil.c
+++ b/multimedia/fxtv/files/patch-xutil.c
@ -1,15 +0,0 @@
--- ./xutil.c.orig	Fri Nov  5 09:38:54 1999
-+++ ./xutil.c	Tue Oct  9 03:41:54 2007
-@@ -1500,8 +1500,10 @@
-     /**********************************************************************/
- 
-     vinfo_pref.screen = screen;
-    visual = XGetVisualInfo( display, VisualScreenMask, &vinfo_pref, 
-                             &num_visuals );
-+    vinfo_pref.depth = DefaultDepth( display, screen );
-+    visual = XGetVisualInfo( display,
-+                             VisualScreenMask | VisualDepthMask,
-+                             &vinfo_pref, &num_visuals );
-     if ( num_visuals == 0 ) {
-         fprintf( stderr, "XGetVisualInfo() says no visuals available!\n" );
-         exit(1);
--- a/multimedia/fxtv/pkg-descr
+++ b/multimedia/fxtv/pkg-descr
@ -1,12 +0,0 @@
-Fxtv is an X11-based FreeBSD app that provides TV-in-a-window and
-image/audio/video capture capabilities for Brooktree Bt848/849/878/879
-and Pinnacle PCTV tuner/capture cards.
-
-To use this app, you need a capture card supported by the bktr(4) driver.
-Examples include the Hauppauge Wincast/TV, the STB TV PCI, and the
-Intel Smart Video Recorder III. See the 'bktr' man page
-for more information.
-
-Refer to the README for details on usage.
-
-WWW: http://people.FreeBSD.org/~rhh/fxtv/
--- a/multimedia/fxtv/pkg-plist
+++ b/multimedia/fxtv/pkg-plist
@ -1,13 +0,0 @@
-bin/fxtv
-lib/X11/app-defaults/Fxtv
-lib/X11/fxtv/README
-lib/X11/fxtv/bitmaps/mini-camera.xpm
-lib/X11/fxtv/bitmaps/mini-down.xbm
-lib/X11/fxtv/bitmaps/mini-resize.xpm
-lib/X11/fxtv/bitmaps/mini-sound.xbm
-lib/X11/fxtv/bitmaps/mini-up.xbm
-lib/X11/fxtv/bitmaps/radio_off.xbm
-lib/X11/fxtv/bitmaps/radio_on.xbm
-lib/X11/fxtv/fxtv_cnvt.sh
-@dirrm lib/X11/fxtv/bitmaps
-@dirrm lib/X11/fxtv
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@ -1,30 +0,0 @@
-# New ports collection makefile for:    mplex
-# Date created:         Wed Jul 31 20:54:54 CDT 1996
-# Whom:                 erich@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mplex
-PORTVERSION=	1.1
-CATEGORIES=	multimedia
-MASTER_SITES=	http://ftp.yars.free.net/pub/software/unix/X11/mpeg/ \
-		http://www.netsw.org/graphic/movie/mpeg/mplex/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Multiplexes MPEG component streams into system layers
-
-# Depended on by multimedia/fxtv
-DEPRECATED=     Upstream disapeared and distfile is not available
-EXPIRATION_DATE=        2011-10-31
-
-CONFLICTS=	mjpegtools-*
-
-MAN1=		mplex.1
-PLIST_FILES=	bin/mplex
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mplex ${PREFIX}/bin
-	${INSTALL_MAN} ${FILESDIR}/mplex.1 ${PREFIX}/man/man1
-
-.include <bsd.port.mk>
--- a/multimedia/mplex/distinfo
+++ b/multimedia/mplex/distinfo
@ -1,2 +0,0 @@
-SHA256 (mplex-1.1.tar.gz) = d88dce2bac31b2516a3740602c786f35b1c61871a2e134460fdfd66e9cc8f900
-SIZE (mplex-1.1.tar.gz) = 34902
--- a/multimedia/mplex/files/mplex.1
+++ b/multimedia/mplex/files/mplex.1
@ -1,18 +0,0 @@
-.\" The following requests are required for all man pages.
-.Dd Thu Aug  1 09:36:57 CDT 1996
-.Os
-.Dt mplex 1
-.Sh NAME
-.Nm mplex
-.Sh SYNOPSIS
-.Nm mplex
-.Ar file1
-.Op file2
-.Ar file3
-.Sh DESCRIPTION
-.Nm mplex
-multiplexes MPEG audio and video streams into system layers.
-
-.Sh AUTHORS
-mplex was written by Christoph Moar <moar@informatik.tu-muenchen.de>.
-This man page was written by Eric L. Hernes <erich@FreeBSD.org>
--- a/multimedia/mplex/files/patch-ab
+++ b/multimedia/mplex/files/patch-ab
@ -1,17 +0,0 @@
--- Makefile.orig	Tue Apr 11 02:46:13 1995
-+++ Makefile	Mon Sep  4 18:13:42 2000
-@@ -19,10 +19,12 @@
- 
- #CFLAGS =  -g
- 
-CFLAGS =  -O
-+CFLAGS?=  -O
- LDFLAGS=  -lm
-CC     =  cc
-+CC     ?=  cc
- RM     =  /bin/rm -f
-+
-+CFLAGS+= -DTIMER
- 
- OBJS = main.o bitstrm.o buffer.o inits.o inptstrm.o interact.o multplex.o systems.o timecode.o
- 
--- a/multimedia/mplex/files/patch-ac
+++ b/multimedia/mplex/files/patch-ac
@ -1,24 +0,0 @@
--- inptstrm.c.orig	Wed May 31 08:04:11 1995
-+++ inptstrm.c	Mon Sep  4 18:17:45 2000
-@@ -1,4 +1,5 @@
- #include "main.h"
-+extern int Interactive;
- /*************************************************************************
-     MPEG Streams Kontrolle
- 
-@@ -310,6 +311,7 @@
-     fclose (info_file);
-     output_info_video (video_info);
- 
-+  if( Interactive )
-     ask_continue ();
- }
- 
-@@ -565,6 +567,7 @@
-     close_bit_stream_r (&audio_bs);
-     fclose (info_file);
-     output_info_audio (audio_info);
-+  if( Interactive )
-     ask_continue ();
- 
- }
--- a/multimedia/mplex/files/patch-ad
+++ b/multimedia/mplex/files/patch-ad
@ -1,59 +0,0 @@
--- multplex.c.orig	Tue Jun  6 07:16:52 1995
-+++ multplex.c	Mon Sep  4 18:17:45 2000
-@@ -1,4 +1,5 @@
- #include "main.h"
-+extern int Interactive;
- #ifdef TIMER
-     extern long total_sec;
-     extern long total_usec;
-@@ -129,6 +130,7 @@
- 	picture_start = TRUE;
-     }
- 
-+if( Interactive ) {
- printf("\nMerging elementary streams to MPEG/SYSTEMS multiplexed stream.\n");
- printf("\n+------------------ MPEG/SYSTEMS INFORMATION -----------------+\n");
-     
-@@ -144,6 +146,12 @@
-     scanf ("%ld", &video_buffer_size);
-     printf   ("STD audio buffer in kB (CSPS: max  4 kB) : ");
-     scanf ("%ld", &audio_buffer_size);
-+} else {
-+    sector_size=2324;
-+    packets_per_pack=1;
-+    video_buffer_size=46;
-+    audio_buffer_size=4;
-+}
- 
-     write_pack = packets_per_pack;
-     video_buffer_size *= 1024;
-@@ -197,6 +205,7 @@
- 		 (double)(packets_per_pack-1.))) / (double)(packets_per_pack) );
-     data_rate = ceil(dmux_rate/50.)*50;
- 
-+if( Interactive ) {
-     printf ("\ncomputed multiplexed stream data rate    : %7.3f\n",dmux_rate);
-     printf ("target data rate (e.g. %6u)           : ",data_rate);
-     scanf  ("%lf", &dmux_rate);
-@@ -206,12 +215,21 @@
-     scanf  ("%u", &video_delay_ms);
-     printf ("audio stream startup offset (ms)         : ");
-     scanf  ("%u", &audio_delay_ms);
-+} else {
-+    dmux_rate=data_rate;
-+    sectors_delay=8;
-+    video_delay_ms=0;
-+    audio_delay_ms=0;
-+}
- 
-     video_delay = (double)video_delay_ms*(double)(CLOCKS/1000);
-     audio_delay = (double)audio_delay_ms*(double)(CLOCKS/1000);
- 
-+if( Interactive ) {
-     verbose=ask_verbose();
-     printf ("\n");
-+} else
-+    verbose=1;
- 
- #ifdef TIMER
-     gettimeofday (&tp_global_start,NULL);
--- a/multimedia/mplex/files/patch-ae
+++ b/multimedia/mplex/files/patch-ae
@ -1,20 +0,0 @@
--- interact.c.orig	Wed May 31 20:18:33 1995
-+++ interact.c	Fri Feb 11 10:04:07 2000
-@@ -67,7 +67,7 @@
-     char input[20];
- 
-     printf ("\nContinue processing (y/n) : ");
-    do gets (input);
-+    do fgets (input, sizeof(input), stdin);
-     while (input[0]!='N'&&input[0]!='n'&&input[0]!='y'&&input[0]!='Y');
- 
-     if (input[0]=='N' || input[0]=='n')
-@@ -92,7 +92,7 @@
-     char input[20];
- 
-     printf ("\nVery verbose mode (y/n) : ");
-    do gets (input);
-+    do fgets (input, sizeof(input), stdin);
-     while (input[0]!='N'&&input[0]!='n'&&input[0]!='y'&&input[0]!='Y');
- 
-     if (input[0]=='N' || input[0]=='n') return (FALSE); else return (TRUE);
--- a/multimedia/mplex/files/patch-af
+++ b/multimedia/mplex/files/patch-af
@ -1,34 +0,0 @@
--- main.c.orig	Wed Apr  5 03:51:53 1995
-+++ main.c	Mon Sep  4 18:17:45 2000
-@@ -59,6 +59,7 @@
- *************************************************************************/
- 
- #include "main.h"
-+#include <unistd.h>
- 
- /*************************************************************************
-     Main
-@@ -75,6 +76,8 @@
-     struct timeval  tp_global_end;
- #endif
- 
-+int Interactive=0;
-+
- int main (argc, argv)
- 
- int argc;
-@@ -93,6 +96,14 @@
-     unsigned int which_streams=0;
-     double	startup_delay=0;
- 
-+    int tmp;
-+
-+    if( getopt( argc, argv, "i" ) == 'i' )
-+      Interactive=1;
-+
-+    optind -= 1;
-+    argc -= optind;
-+    argv += optind;
- 
-     intro (argc);
-     check_files (argc, argv, &audio_file, &video_file, &multi_file,
--- a/multimedia/mplex/pkg-descr
+++ b/multimedia/mplex/pkg-descr
@ -1,17 +0,0 @@
-The mplex multiplexes MPEG audio and video streams into system layers.
-
-From INSTRUCT (in the mplex source):
->
-> Please note that I do not have a comprehensive instruction manual for this
-> release. I suggest you try the program out with some default values and
-> learn something more about ISO/IEC 11172-1 (aka MPEG1/Systems).
->
->
-> Christoph.
-> moar@heaven.zfe.siemens.de
-> +---------------------------------------+--------------------------------+
-> | http://www.informatik.tu-muenchen.de/ |                 Christoph Moar |
-> | cgi-bin/nph-gateway/hphalle6/~moar/   |                Kaulbachstr.29a |
-> | index.html                            |                   80539 Munich |
-> | email:moar@informatik.tu-muenchen.de  |   voice: ++49 - 89 -  23862874 |
-> +---------------------------------------+--------------------------------+
--- a/net/Makefile
+++ b/net/Makefile
@ -885,7 +885,6 @@
    SUBDIR += py-soapy
    SUBDIR += py-spreadmodule
    SUBDIR += py-suds
-    SUBDIR += py-timeoutsocket
    SUBDIR += py-tofu
    SUBDIR += py-twistedPair
    SUBDIR += py-twitter
--- a/net/py-timeoutsocket/Makefile
+++ b/net/py-timeoutsocket/Makefile
@ -1,24 +0,0 @@
-# New ports collection makefile for:	timeoutsocket
-# Date created:		23 April 2007
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	timeoutsocket
-PORTVERSION=	1.23
-CATEGORIES=	net python
-MASTER_SITES=	CENKES
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Timeout mechanism for TCP connections
-
-# Depended on by www/newsfeed
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-10-31
-
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-
-.include <bsd.port.mk>
--- a/Show More
+++ b/Show More