summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2011-04-18 22:25:41 +0000
committerRene Ladan <rene@FreeBSD.org>2011-04-18 22:25:41 +0000
commit48f1d8c469aeb67c4c7838bd2bdf17f28eacbc79 (patch)
tree5509f9ae2d797f02944d429c11a7b43a3c3d2cf3 /net
parentRepair pkg-plist to remove directories created by NLS option. (diff)
Remove most expired ports:
2011-04-17 cad/tclspice: has been broken for more than a year 2011-04-17 comms/hcfmdm: does not compile on 7.X or higher 2011-04-17 databases/mysqlcc: has been broken for almost a year 2011-04-17 devel/ruby-rjudy: does not compile on FreeBSD 7.x or newer 2011-04-17 devel/xfc: does not compile on FreeBSD 7.x or newer 2011-04-17 devel/lamson: has been broken for a half year 2011-04-17 devel/cocktail: does not build on FreeBSD 7.x or newer 2011-04-17 devel/djgpp-gcc: has been broken for half a year 2011-04-17 devel/gauche-sdl: has been broken for a year 2011-04-17 devel/gdb53-act: does not compile on FreeBSD 7.x and up 2011-04-17 editors/zed: does not compile on FreeBSD 7.x or newer 2011-04-17 games/aqbubble: does not compile on FreeBSD 7.x or newer 2011-04-17 graphics/libvisual-plugins: has been broken for 3 years 2011-04-17 japanese/roundcube: has been broken for almost a year 2011-04-17 japanese/tkstep80: does not compile on FreeBSD 7.x or newer 2011-04-17 lang/u++: has been broken for over a half year 2011-04-17 lang/pugs: has been broken for over a year 2011-04-17 lang/mozart: does not compile on FreeBSD 7.x or newer 2011-04-17 math/linalg: does not build on FreeBSD 7.x or newer 2011-04-17 math/R-cran-igraph: has been broken for over a half year 2011-04-17 misc/ftree: has been broken for over a half year 2011-04-17 multimedia/katchtv: has been broken for a half year 2011-04-17 multimedia/libomxil-bellagio: has been broken for almost a year 2011-04-17 multimedia/banshee-mirage: has been broken for over a half year 2011-04-17 net-p2p/trackerbt: has been broken for a half year 2011-04-17 net/cap: does not compile on FreeBSD 7.x or newer 2011-04-17 net/ggsd: does not compile on FreeBSD 7.x or newer 2011-04-17 net/b2bua: does not compile on FreeBSD 7.x or newer 2011-04-17 net/penguintv: has been broken for a half year 2011-04-17 news/openftd: has been broken for almost a year 2011-04-17 palm/romeo: does not compile on FreeBSD 7.x or newer 2011-04-17 science/pcp: does not compile on FreeBSD 7.x or newer 2011-04-17 science/elmer-fem: has been broken for over a year 2011-04-17 security/newpki-lib: does not compile on FreeBSD 7.x or newer 2011-04-17 security/newpki-server: does not compile on FreeBSD 7.x or newer 2011-04-17 security/xmlsec: does not compile on FreeBSD 7.x or newer 2011-04-17 security/f-protd: has been broken for over a year 2011-04-17 sysutils/xwlans: does not compile on FreeBSD 7.x or newer 2011-04-17 www/bk_edit: does not compile on FreeBSD 7.x and newer 2011-04-17 www/bricolage: has been broken for a half year 2011-04-17 x11-toolkits/gauche-gtk: has been broken for a year 2011-04-17 x11-toolkits/gambas2-gb-qt: has been broken for over a year 2011-04-17 x11-toolkits/php-gtk2: has been broken for over a half year 2011-04-17 x11-toolkits/p5-Tcl-Tk: has been broken for 2 year 2011-04-17 x11/metisse: has been broken for over a half year
Notes
Notes: svn path=/head/; revision=272897
Diffstat (limited to 'net')
-rw-r--r--net/Makefile4
-rw-r--r--net/b2bua/Makefile47
-rw-r--r--net/b2bua/distinfo2
-rw-r--r--net/b2bua/files/patch-build::Makefile.pkg16
-rw-r--r--net/b2bua/files/patch-build::Makefile.pre14
-rw-r--r--net/b2bua/files/patch-contrib::Makefile14
-rw-r--r--net/b2bua/files/patch-contrib::Makefile.pkg18
-rw-r--r--net/b2bua/files/patch-contrib::libcext_lgpl::Makefile14
-rw-r--r--net/b2bua/files/patch-contrib::libcext_lgpl::netdb_r.h21
-rw-r--r--net/b2bua/files/patch-gcc34516
-rw-r--r--net/b2bua/files/patch-sip::b2b::AuthAgent.cxx107
-rw-r--r--net/b2bua/files/patch-sip::b2b::B2bDef.hxx15
-rw-r--r--net/b2bua/files/patch-util::threads::VSemaphore.hxx14
-rw-r--r--net/b2bua/files/patch-util::transport::UdpStack.cxx13
-rw-r--r--net/b2bua/pkg-descr9
-rw-r--r--net/b2bua/pkg-plist7
-rw-r--r--net/cap/Makefile122
-rw-r--r--net/cap/distinfo26
-rw-r--r--net/cap/files/m4.features245
-rw-r--r--net/cap/files/m4.setup.in543
-rw-r--r--net/cap/files/patch-aa92
-rw-r--r--net/cap/files/patch-ab15
-rw-r--r--net/cap/files/patch-ac52
-rw-r--r--net/cap/files/patch-ad35
-rw-r--r--net/cap/files/patch-ae189
-rw-r--r--net/cap/files/patch-af73
-rw-r--r--net/cap/files/patch-ag10
-rw-r--r--net/cap/files/patch-ah17
-rw-r--r--net/cap/files/patch-ai29
-rw-r--r--net/cap/files/patch-applications-aufs-afpos.c11
-rw-r--r--net/cap/files/patch-applications-lwsrv-lwsrv.c54
-rw-r--r--net/cap/files/patch-applications-lwsrv-simple.c98
-rw-r--r--net/cap/files/patch-applications-papif-papif.c21
-rw-r--r--net/cap/files/patch-contrib-MacPS-macps-22.shar26
-rw-r--r--net/cap/files/patch-contrib-MacPS-prepfix.c21
-rw-r--r--net/cap/files/patch-lib-cap-ablog.c66
-rw-r--r--net/cap/files/patch-papif.c20
-rw-r--r--net/cap/files/patch-support-ethertalk-aarpd_clnt.c46
-rw-r--r--net/cap/files/patch-support-ethertalk-aarpd_svc.c31
-rw-r--r--net/cap/files/patch-support-ethertalk-aarpd_xdr.c20
-rw-r--r--net/cap/files/pkg-message.in4
-rw-r--r--net/cap/pkg-descr23
-rw-r--r--net/cap/pkg-plist87
-rw-r--r--net/cap/scripts/configure33
-rw-r--r--net/ggsd/Makefile39
-rw-r--r--net/ggsd/distinfo2
-rw-r--r--net/ggsd/files/patch-aa13
-rw-r--r--net/ggsd/pkg-descr5
-rw-r--r--net/ggsd/pkg-plist4
-rw-r--r--net/penguintv/Makefile66
-rw-r--r--net/penguintv/distinfo2
-rw-r--r--net/penguintv/files/patch-penguintv-utils.py12
-rw-r--r--net/penguintv/files/patch-share_defaults.opml22
-rw-r--r--net/penguintv/pkg-descr22
-rw-r--r--net/penguintv/pkg-message11
-rw-r--r--net/penguintv/pkg-plist239
56 files changed, 0 insertions, 3277 deletions
diff --git a/net/Makefile b/net/Makefile
index 88a2d8b4a502..0fbfaf39b4b3 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -46,7 +46,6 @@
SUBDIR += avahi-qt3
SUBDIR += avahi-qt4
SUBDIR += avahi-sharp
- SUBDIR += b2bua
SUBDIR += babeld
SUBDIR += balance
SUBDIR += bbsnet
@@ -77,7 +76,6 @@
SUBDIR += cagibi
SUBDIR += callgen323
SUBDIR += callweaver
- SUBDIR += cap
SUBDIR += ccxstream
SUBDIR += citrix_ica
SUBDIR += citrix_xenapp
@@ -179,7 +177,6 @@
SUBDIR += gateway6
SUBDIR += generic-nqs
SUBDIR += get_iplayer
- SUBDIR += ggsd
SUBDIR += gini
SUBDIR += gkrellmmultiping2
SUBDIR += gkrellmqst
@@ -814,7 +811,6 @@
SUBDIR += pecl-radius
SUBDIR += pecl-yaz
SUBDIR += pen
- SUBDIR += penguintv
SUBDIR += perldap
SUBDIR += pfflowd
SUBDIR += pfinger
diff --git a/net/b2bua/Makefile b/net/b2bua/Makefile
deleted file mode 100644
index 66d575f5e2d7..000000000000
--- a/net/b2bua/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for: b2bua
-# Date created: 6 December 2002
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= b2bua
-PORTVERSION= 1.5.0
-PORTREVISION= 2
-CATEGORIES= net
-MASTER_SITES= http://www.vovida.org/downloads/sip/${PORTVERSION}/
-DISTNAME= sip-${PORTVERSION}
-
-MAINTAINER= sobomax@FreeBSD.org
-COMMENT= A back-to-back (B2B) SIP user agent
-
-LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
-
-BROKEN= Does not compile with GCC 4.2
-DEPRECATED= does not compile on FreeBSD 7.x or newer
-EXPIRATION_DATE=2011-04-17
-
-USE_GMAKE= yes
-ALL_TARGET= b2bua
-CFLAGS+= -Wno-deprecated
-MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" \
- PTHREAD_LIBNAME="${PTHREAD_LIBNAME}" \
- VOCAL_USE_SYSTEM_LIBXML=true
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64
-.endif
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/sip/b2b/bin.nodebug.FreeBSD.${MACHINE_ARCH}/b2bua \
- ${PREFIX}/bin
- ${MKDIR} ${DOCSDIR}
-.for file in LICENSE HOWTO HOWTO.PROV b2bdesign.pdf
- ${INSTALL_DATA} ${WRKSRC}/sip/b2b/${file} ${DOCSDIR}
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/sip/b2b/b2bConfig.xml \
- ${PREFIX}/etc/b2bConfig.xml.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/b2bua/distinfo b/net/b2bua/distinfo
deleted file mode 100644
index b0bec24c840e..000000000000
--- a/net/b2bua/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (sip-1.5.0.tar.gz) = 5f6f17ec659f6cd055f09f88a98dbd4458b34a9c9e259e8f8321bd5708781f67
-SIZE (sip-1.5.0.tar.gz) = 6709076
diff --git a/net/b2bua/files/patch-build::Makefile.pkg b/net/b2bua/files/patch-build::Makefile.pkg
deleted file mode 100644
index 2c5a9cf54dba..000000000000
--- a/net/b2bua/files/patch-build::Makefile.pkg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- build/Makefile.pkg.orig Thu Apr 3 00:35:44 2003
-+++ build/Makefile.pkg Fri Apr 4 13:06:17 2003
-@@ -585,8 +585,8 @@
- ifneq ($(OSTYPE),FreeBSD)
- PTHREAD_LIBNAME := pthread
- else
--PTHREAD_LDFLAGS := -pthread
--PTHREAD_LIBNAME := c_r
-+PTHREAD_LDFLAGS ?= -pthread
-+PTHREAD_LIBNAME ?= c_r
- endif
-
- ifeq ($(OSTYPE),IRIX64)
diff --git a/net/b2bua/files/patch-build::Makefile.pre b/net/b2bua/files/patch-build::Makefile.pre
deleted file mode 100644
index d4144759c4fc..000000000000
--- a/net/b2bua/files/patch-build::Makefile.pre
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- build/Makefile.pre.orig Thu Apr 3 00:35:44 2003
-+++ build/Makefile.pre Fri Apr 4 13:06:17 2003
-@@ -83,7 +83,7 @@
- # please see Makefile.tools for more information.
-
- VOCAL_TOOLCHAIN_TYPE := gnu
--VOCAL_COMPILE_TYPE := debug
-+VOCAL_COMPILE_TYPE := nodebug
-
-
- ######################################################################
diff --git a/net/b2bua/files/patch-contrib::Makefile b/net/b2bua/files/patch-contrib::Makefile
deleted file mode 100644
index 9331b960ecd4..000000000000
--- a/net/b2bua/files/patch-contrib::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- contrib/Makefile.orig Thu Feb 20 06:22:29 2003
-+++ contrib/Makefile Fri Apr 4 13:06:17 2003
-@@ -26,7 +26,7 @@
-
- INSTALL = install
-
--CODE_DEPENDS = libxml
-+CODE_DEPENDS =
-
- ifeq ($(OSTYPE),FreeBSD)
- CODE_DEPENDS += libcext_bsd libcext_lgpl
diff --git a/net/b2bua/files/patch-contrib::Makefile.pkg b/net/b2bua/files/patch-contrib::Makefile.pkg
deleted file mode 100644
index b4b9e3f062c7..000000000000
--- a/net/b2bua/files/patch-contrib::Makefile.pkg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- contrib/Makefile.pkg.orig Sat Feb 1 02:15:57 2003
-+++ contrib/Makefile.pkg Fri Apr 4 13:06:17 2003
-@@ -49,9 +49,9 @@
- # libxml
-
- ifeq ($(VOCAL_USE_SYSTEM_LIBXML),true)
-- LIBXML_INCLUDEDIRS := /usr/local/include/libxml2 /usr/local/include/libxml2/libxml /usr/local/include
-- LIBXML_LIBDIRS := /usr/local/lib
-- LIBXML_LDLIBS_LAST := -lxml
-+ LIBXML_INCLUDEDIRS := ${LOCALBASE}/include/libxml2 ${LOCALBASE}/include/libxml2/libxml ${LOCALBASE}/include
-+ LIBXML_LIBDIRS := ${LOCALBASE}/lib
-+ LIBXML_LDLIBS_LAST := -lxml2
- else
- LIBXML_INCLUDEDIRS := $(ROOT)/contrib/libxml2.$(OS_ARCH) $(ROOT)/contrib/libxml2.$(OS_ARCH)/include/libxml $(ROOT)/contrib/libxml2.$(OS_ARCH)/include
- LIBXML_LIBDIRS := $(ROOT)/contrib/libxml2.$(OS_ARCH)/.libs
diff --git a/net/b2bua/files/patch-contrib::libcext_lgpl::Makefile b/net/b2bua/files/patch-contrib::libcext_lgpl::Makefile
deleted file mode 100644
index 973cb2e98e90..000000000000
--- a/net/b2bua/files/patch-contrib::libcext_lgpl::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- contrib/libcext_lgpl/Makefile
-+++ contrib/libcext_lgpl/Makefile
-@@ -19,7 +19,7 @@
-
- # FreeBSD
- AR=ar r
--OBJS = gethostby_r.o getnetby_r.o getprotoby_r.o getpw_r.o getservby_r.o
-+OBJS = getpw_r.o
- endif
-
- libcext_lgpl.a: $(OBJS)
diff --git a/net/b2bua/files/patch-contrib::libcext_lgpl::netdb_r.h b/net/b2bua/files/patch-contrib::libcext_lgpl::netdb_r.h
deleted file mode 100644
index 96c215960a96..000000000000
--- a/net/b2bua/files/patch-contrib::libcext_lgpl::netdb_r.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- contrib/libcext_lgpl/netdb_r.h
-+++ contrib/libcext_lgpl/netdb_r.h
-@@ -2,6 +2,7 @@
- extern "C" {
- #endif
-
-+#if !defined(__FreeBSD__)
- struct hostent *
- gethostbyaddr_r (const char *addr, int length, int type,
- struct hostent *result, char *buffer, int buflen,
-@@ -15,6 +16,7 @@
- struct hostent *
- gethostent_r (struct hostent *result, char *buffer, int buflen,
- int *h_errnop);
-+#endif
-
- #ifdef __cplusplus
- }
diff --git a/net/b2bua/files/patch-gcc34 b/net/b2bua/files/patch-gcc34
deleted file mode 100644
index dcbb50bde04a..000000000000
--- a/net/b2bua/files/patch-gcc34
+++ /dev/null
@@ -1,516 +0,0 @@
---- util/Timer.h 2004/08/22 17:39:10 1.1
-+++ util/Timer.h 2004/08/22 17:39:44
-@@ -68,6 +68,7 @@
-
- #include "global.h"
- #include <list>
-+#include <iostream>
-
- bool operator < ( const timeval& lhs, const timeval& rhs);
- void addMs ( timeval* lhs, int timeMs);
---- util/mstring.hxx 2004/08/22 17:40:25 1.1
-+++ util/mstring.hxx 2004/08/22 17:45:07
-@@ -206,6 +206,7 @@
- ///Compare two strings ignoring case. The function is provided just for convinience and uniformity
- int comparei(const string &str, size_type len = npos) const;
-
-+#if 0
- ///Compare two strings. The function is provided just for convinience and uniformity
- friend int compare(const mstring &str1, const mstring &str2, size_type len = npos)
- {
-@@ -217,6 +218,7 @@
- {
- return str1.comparei(str2, len);
- }
-+#endif
-
- ///Insert pair-symb into the string
- mstring & ins_pair(const string &chrset, char pair_symb);
---- util/Fifo.cc 2004/08/22 17:47:54 1.1
-+++ util/Fifo.cc 2004/08/22 17:49:21
-@@ -87,7 +87,7 @@
- // This will unlock the object's mutex, wait for a condition's signal,
- // and relock.
- //
-- int error = myCondition.wait(&myMutex, relativeTimeout);
-+ int error = myCondition.wait(&this->myMutex, relativeTimeout);
-
- if ( error != 0 )
- {
-@@ -107,5 +107,5 @@
- }
- }
-
-- return ( myFifoSize );
-+ return ( this->myFifoSize );
- }
---- util/PollFifo.cc 2004/08/22 17:50:02 1.1
-+++ util/PollFifo.cc 2004/08/22 17:50:54
-@@ -140,7 +140,7 @@
- // The mutex is locked coming into this method. Unlock it while we
- // block so others can use the Fifo.
- //
-- myMutex.unlock();
-+ this->myMutex.unlock();
-
- // Block, waiting for io activity. This may throw a transport
- // exception. If so, let it pass through.
-@@ -151,7 +151,7 @@
-
- // Lock the Fifo back up.
- //
-- myMutex.lock();
-+ this->myMutex.lock();
-
- VDEBUG(log) << fn << ": poll returned. fds active = " << numberFdsActive
- << VDEBUG_END(log);
---- sip/sipstack/BaseUrl.hxx 2004/08/22 17:58:41 1.1
-+++ sip/sipstack/BaseUrl.hxx 2004/08/22 18:02:58
-@@ -143,7 +143,7 @@
- namespace std
- #endif
- {
-- struct hash< Sptr < Vocal::BaseUrl > >
-+ template <> struct hash< Sptr < Vocal::BaseUrl > >
- {
- size_t operator() ( const Sptr < Vocal::BaseUrl >& src ) const
- {
---- sip/sipstack/SipAcceptEncoding.cxx 2004/08/22 18:07:01 1.1
-+++ sip/sipstack/SipAcceptEncoding.cxx 2004/08/22 18:08:13
-@@ -103,7 +103,7 @@
-
- scanAcceptEncoding(vdata);
- }
-- catch (SipAcceptEncodingParserException exception)
-+ catch (SipAcceptEncodingParserException&)
- {
-
- if (SipParserMode::sipParserMode())
---- sip/sipstack/SipAllow.cxx 2004/08/22 18:10:09 1.1
-+++ sip/sipstack/SipAllow.cxx 2004/08/22 18:10:22
-@@ -109,7 +109,7 @@
-
- scanSipAllow(vdata);
- }
-- catch (SipAllowParserException exception)
-+ catch (SipAllowParserException&)
- {
-
- if (SipParserMode::sipParserMode())
---- sip/sipstack/SipAcceptLanguage.cxx 2004/08/22 18:09:08 1.1
-+++ sip/sipstack/SipAcceptLanguage.cxx 2004/08/22 18:09:20
-@@ -99,7 +99,7 @@
-
- scanAcceptLanguage(vdata);
- }
-- catch (SipAcceptLanguageParserException exception)
-+ catch (SipAcceptLanguageParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipAlso.cxx 2004/08/22 18:11:02 1.1
-+++ sip/sipstack/SipAlso.cxx 2004/08/22 18:11:24
-@@ -257,7 +257,7 @@
-
- scanSipAlso(data);
- }
-- catch (SipAlsoParserException exception)
-+ catch (SipAlsoParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
-@@ -283,7 +283,7 @@
- {
- parse(alsostr);
- }
-- catch (SipAlsoParserException exception)
-+ catch (SipAlsoParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipAuthorization.cxx 2004/08/22 18:12:06 1.1
-+++ sip/sipstack/SipAuthorization.cxx 2004/08/22 18:13:29
-@@ -135,7 +135,7 @@
- {
- scanSipAuthorization(nData);
- }
-- catch (SipAuthorizationParserException exception)
-+ catch (SipAuthorizationParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipCSeq.cxx 2004/08/22 18:14:16 1.1
-+++ sip/sipstack/SipCSeq.cxx 2004/08/22 18:14:37
-@@ -173,7 +173,7 @@
- {
- parse(cseqstr);
- }
-- catch (SipCSeqParserException exception)
-+ catch (SipCSeqParserException&)
- {
-
- if (SipParserMode::sipParserMode())
-@@ -237,7 +237,7 @@
- {
- scanSipCSeq(data);
- }
-- catch (SipCSeqParserException exception)
-+ catch (SipCSeqParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipCallId.cxx 2004/08/22 18:16:07 1.1
-+++ sip/sipstack/SipCallId.cxx 2004/08/22 18:16:25
-@@ -163,7 +163,7 @@
-
- scanSipCallId(data);
- }
-- catch (SipCallIdParserException exception)
-+ catch (SipCallIdParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
-@@ -189,7 +189,7 @@
- {
- parse(callidstr);
- }
-- catch (SipCallIdParserException exception)
-+ catch (SipCallIdParserException&)
- {
-
- if (SipParserMode::sipParserMode())
---- sip/sipstack/SipContact.cxx 2004/08/22 18:17:25 1.1
-+++ sip/sipstack/SipContact.cxx 2004/08/22 18:17:39
-@@ -138,7 +138,7 @@
- {
- parse(contactstr);
- }
-- catch (SipContactParserException exception)
-+ catch (SipContactParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipContentLength.cxx 2004/08/22 18:21:48 1.1
-+++ sip/sipstack/SipContentLength.cxx 2004/08/22 18:22:00
-@@ -113,7 +113,7 @@
- {
- parse(clstr);
- }
-- catch (SipContentLengthParserException exception)
-+ catch (SipContentLengthParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipContentDisposition.cxx 2004/08/22 18:18:37 1.1
-+++ sip/sipstack/SipContentDisposition.cxx 2004/08/22 18:18:53
-@@ -115,7 +115,7 @@
-
- scanSipContentDisposition(nData);
- }
-- catch (SipContentDispositionParserException exception)
-+ catch (SipContentDispositionParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipContentEncoding.cxx 2004/08/22 18:19:32 1.1
-+++ sip/sipstack/SipContentEncoding.cxx 2004/08/22 18:19:46
-@@ -112,7 +112,7 @@
- {
- scanSipContentEncoding(nData);
- }
-- catch (SipContentEncodingParserException exception)
-+ catch (SipContentEncodingParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipContentLanguage.cxx 2004/08/22 18:20:43 1.1
-+++ sip/sipstack/SipContentLanguage.cxx 2004/08/22 18:20:57
-@@ -123,7 +123,7 @@
-
- scanSipContentLanguage(nData);
- }
-- catch (SipContentLanguageParserException exception)
-+ catch (SipContentLanguageParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipDate.cxx 2004/08/22 18:22:49 1.1
-+++ sip/sipstack/SipDate.cxx 2004/08/22 18:23:03
-@@ -110,7 +110,7 @@
-
- scanSipDate(nData);
- }
-- catch (SipDateParserException exception)
-+ catch (SipDateParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipDiversion.cxx 2004/08/22 18:23:50 1.1
-+++ sip/sipstack/SipDiversion.cxx 2004/08/22 18:24:07
-@@ -262,7 +262,7 @@
- {
- parse(rdata);
- }
-- catch (SipDiversionParserException exception)
-+ catch (SipDiversionParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
-@@ -394,7 +394,7 @@
-
- scanSipDiversion(data);
- }
-- catch (SipDiversionParserException exception)
-+ catch (SipDiversionParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipEncryption.cxx 2004/08/22 18:24:48 1.1
-+++ sip/sipstack/SipEncryption.cxx 2004/08/22 18:24:59
-@@ -97,7 +97,7 @@
- {
- scanEncryption(data1);
- }
-- catch (SipEncryptionParserException exception)
-+ catch (SipEncryptionParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipExpires.cxx 2004/08/22 18:25:40 1.1
-+++ sip/sipstack/SipExpires.cxx 2004/08/22 18:26:02
-@@ -105,7 +105,7 @@
-
- scanSipExpires(nData);
- }
-- catch (SipExpiresParserException exception)
-+ catch (SipExpiresParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipHide.cxx 2004/08/22 18:27:00 1.1
-+++ sip/sipstack/SipHide.cxx 2004/08/22 18:27:15
-@@ -116,7 +116,7 @@
-
- scanHide(data1);
- }
-- catch (SipHideParserException exception)
-+ catch (SipHideParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipInReplyTo.cxx 2004/08/22 18:27:59 1.1
-+++ sip/sipstack/SipInReplyTo.cxx 2004/08/22 18:28:26
-@@ -123,7 +123,7 @@
-
- scanSipInReplyTo(nData);
- }
-- catch (SipInReplyToParserException exception)
-+ catch (SipInReplyToParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipMaxForwards.cxx 2004/08/22 18:29:14 1.1
-+++ sip/sipstack/SipMaxForwards.cxx 2004/08/22 18:29:33
-@@ -118,7 +118,7 @@
-
- scanSipMaxForwards(nData);
- }
-- catch (SipMaxForwardsParserException exception)
-+ catch (SipMaxForwardsParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipMimeVersion.cxx 2004/08/22 18:30:23 1.1
-+++ sip/sipstack/SipMimeVersion.cxx 2004/08/22 18:30:39
-@@ -113,7 +113,7 @@
-
- scanSipMimeVersion(nData);
- }
-- catch (SipMimeVersionParserException exception)
-+ catch (SipMimeVersionParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipMinSE.cxx 2004/08/22 18:31:20 1.1
-+++ sip/sipstack/SipMinSE.cxx 2004/08/22 18:31:35
-@@ -101,7 +101,7 @@
- {
- scanSipMinSE(nData);
- }
-- catch (SipMinSEParserException exception)
-+ catch (SipMinSEParserException&)
- {
- parseError("Failed to Decode SipMinSE in decode() " );
- }
---- sip/sipstack/SipOrganization.cxx 2004/08/22 18:32:44 1.1
-+++ sip/sipstack/SipOrganization.cxx 2004/08/22 18:33:01
-@@ -123,7 +123,7 @@
- {
- scanSipOrganization(nData);
- }
-- catch (SipOrganizationParserException exception)
-+ catch (SipOrganizationParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipPriority.cxx 2004/08/22 18:33:59 1.1
-+++ sip/sipstack/SipPriority.cxx 2004/08/22 18:34:15
-@@ -136,7 +136,7 @@
- {
- scanPriority(data1);
- }
-- catch (SipPriorityParserException exception)
-+ catch (SipPriorityParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipRecordRoute.cxx 2004/08/22 18:38:29 1.1
-+++ sip/sipstack/SipRecordRoute.cxx 2004/08/22 18:38:44
-@@ -115,7 +115,7 @@
- {
- parse(rrstr);
- }
-- catch (SipRecordRouteParserException exception)
-+ catch (SipRecordRouteParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipProxyAuthenticate.cxx 2004/08/22 18:35:29 1.1
-+++ sip/sipstack/SipProxyAuthenticate.cxx 2004/08/22 18:35:52
-@@ -135,7 +135,7 @@
- {
- scanSipProxyauthorization(nData);
- }
-- catch (SipProxyAuthenticateParserException exception)
-+ catch (SipProxyAuthenticateParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipProxyAuthorization.cxx 2004/08/22 18:37:23 1.1
-+++ sip/sipstack/SipProxyAuthorization.cxx 2004/08/22 18:37:37
-@@ -136,7 +136,7 @@
- {
- scanSipProxyauthorization(nData);
- }
-- catch (SipProxyAuthorizationParserException exception)
-+ catch (SipProxyAuthorizationParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipReferredBy.cxx 2004/08/22 18:39:40 1.1
-+++ sip/sipstack/SipReferredBy.cxx 2004/08/22 18:40:00
-@@ -325,7 +325,7 @@
- }
-
- }
-- catch (SipReferredByParserException exception)
-+ catch (SipReferredByParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
-@@ -414,7 +414,7 @@
- // AmyS - 05/16/02. Parse w/o Referred-By in the str.
- parse(alsostr);
- }
-- catch (SipReferredByParserException exception)
-+ catch (SipReferredByParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipReplaces.cxx 2004/08/22 18:42:21 1.1
-+++ sip/sipstack/SipReplaces.cxx 2004/08/22 18:42:34
-@@ -148,7 +148,7 @@
- pdata += data;
- parse(pdata);
- }
-- catch (SipReplacesParserException exception)
-+ catch (SipReplacesParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipRequestLine.cxx 2004/08/22 18:43:23 1.1
-+++ sip/sipstack/SipRequestLine.cxx 2004/08/22 18:43:40
-@@ -146,7 +146,7 @@
- {
- scanSipRequestLine(nData);
- }
-- catch (SipRequestLineParserException exception)
-+ catch (SipRequestLineParserException&)
- {
- cpLog(LOG_ERR, "Failed to Decode in Constructor of Requestline :( ");
- throw SipRequestLineParserException(
---- sip/sipstack/SipRequire.cxx 2004/08/22 18:44:25 1.1
-+++ sip/sipstack/SipRequire.cxx 2004/08/22 18:44:38
-@@ -121,7 +121,7 @@
-
- scanSipRequire(nData);
- }
-- catch (SipRequireParserException exception)
-+ catch (SipRequireParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipSessionExpires.cxx 2004/08/22 18:46:01 1.1
-+++ sip/sipstack/SipSessionExpires.cxx 2004/08/22 18:46:13
-@@ -105,7 +105,7 @@
- {
- scanSipSessionExpires(nData);
- }
-- catch (SipSessionExpiresParserException exception)
-+ catch (SipSessionExpiresParserException&)
- {
- parseError("Failed to Decode SipSessionExpires in decode() " );
- }
---- sip/sipstack/SipStatusLine.cxx 2004/08/22 18:47:02 1.1
-+++ sip/sipstack/SipStatusLine.cxx 2004/08/22 18:47:23
-@@ -166,7 +166,7 @@
-
- scanSipStatusLine(nData);
- }
-- catch (SipStatusLineParserException exception)
-+ catch (SipStatusLineParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipSupported.cxx 2004/08/22 18:48:10 1.1
-+++ sip/sipstack/SipSupported.cxx 2004/08/22 18:48:21
-@@ -117,7 +117,7 @@
-
- scanSipSupported(nData);
- }
-- catch (SipSupportedParserException exception)
-+ catch (SipSupportedParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipTransferTo.cxx 2004/08/22 18:50:24 1.1
-+++ sip/sipstack/SipTransferTo.cxx 2004/08/22 18:50:39
-@@ -263,7 +263,7 @@
-
- scanSipTransferTo(data);
- }
-- catch (SipTransferToParserException exception)
-+ catch (SipTransferToParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
-@@ -285,7 +285,7 @@
- {
- parse(tostr);
- }
-- catch (SipTransferToParserException exception)
-+ catch (SipTransferToParserException&)
- {
- if (SipParserMode::sipParserMode())
- {
---- sip/sipstack/SipWwwAuthenticate.cxx 2004/08/22 18:52:20 1.1
-+++ sip/sipstack/SipWwwAuthenticate.cxx 2004/08/22 18:52:33
-@@ -137,7 +137,7 @@
- {
- scanSipWwwauthorization(nData);
- }
-- catch (SipWwwAuthenticateParserException exception)
-+ catch (SipWwwAuthenticateParserException& exception)
- {
- if (SipParserMode::sipParserMode())
- {
diff --git a/net/b2bua/files/patch-sip::b2b::AuthAgent.cxx b/net/b2bua/files/patch-sip::b2b::AuthAgent.cxx
deleted file mode 100644
index 7ccd7dbddcb0..000000000000
--- a/net/b2bua/files/patch-sip::b2b::AuthAgent.cxx
+++ /dev/null
@@ -1,107 +0,0 @@
-
-$FreeBSD$
-
---- sip/b2b/AuthAgent.cxx.orig Fri Apr 4 12:18:19 2003
-+++ sip/b2b/AuthAgent.cxx Fri Apr 4 12:18:19 2003
-@@ -305,6 +305,31 @@
- AuthAgent::doCancel()
- {
- cpLog(LOG_DEBUG, "AuthAgent::doCancel()");
-+ Sptr<MultiLegCallData> mData =
-+ CallDB::instance().getMultiLegCallData(myInvokee->getCallLeg());
-+ assert(mData != 0);
-+
-+ Sptr<AccountingData> accData = mData->getAccountingData();
-+ time_t t;
-+ t = time(&t);
-+ accData->setEndTime(t);
-+
-+ if(B2bConfig::instance().getStr(B2bConfig::PP_OPTIONS)
-+ != B2bConfig::PP_FREE)
-+ {
-+ ///Send Stop records to billing
-+ int duration = t - accData->getStartTime();
-+ Sptr<BillingData> bData;
-+ bData.dynamicCast(myAAAData);
-+ assert(bData != 0);
-+ bData->setDuration(duration);
-+
-+ Sptr<AAAEvent> aEvent = new AAAEvent(this);
-+ cpLog(LOG_DEBUG, "AuthAgent::Sending Acct Stop");
-+ B2bFacade::instance().getAAATransceiver()->sendAcctStop(aEvent);
-+ }
-+
-+ ///Transit the controller state
- myState->cancel(*this);
- }
-
-@@ -362,6 +387,31 @@
- AuthAgent::callFailed()
- {
- cpLog(LOG_DEBUG, "AuthAgent::callFailed()");
-+ Sptr<MultiLegCallData> mData =
-+ CallDB::instance().getMultiLegCallData(myInvokee->getCallLeg());
-+ assert(mData != 0);
-+
-+ Sptr<AccountingData> accData = mData->getAccountingData();
-+ time_t t;
-+ t = time(&t);
-+ accData->setEndTime(t);
-+
-+ if(B2bConfig::instance().getStr(B2bConfig::PP_OPTIONS)
-+ != B2bConfig::PP_FREE)
-+ {
-+ ///Send Stop records to billing
-+ int duration = t - accData->getStartTime();
-+ Sptr<BillingData> bData;
-+ bData.dynamicCast(myAAAData);
-+ assert(bData != 0);
-+ bData->setDuration(duration);
-+
-+ Sptr<AAAEvent> aEvent = new AAAEvent(this);
-+ cpLog(LOG_DEBUG, "AuthAgent::Sending Acct Stop");
-+ B2bFacade::instance().getAAATransceiver()->sendAcctStop(aEvent);
-+ }
-+
-+ ///Transit the controller state
- myState->fail(*this);
- }
-
-@@ -426,5 +476,37 @@
- void
- AuthAgent::receivedStatus(UaBase& agent, const Sptr<SipMsg>& msg)
- {
-+ Sptr<StatusMsg> statusMsg;
-+ statusMsg.dynamicCast(msg);
-+ assert(statusMsg != 0);
-+ int statusCode = statusMsg->getStatusLine().getStatusCode();
-+ if(statusCode > 200)
-+ {
-+ Sptr<MultiLegCallData> mData =
-+ CallDB::instance().getMultiLegCallData(myInvokee->getCallLeg());
-+ assert(mData != 0);
-+
-+ Sptr<AccountingData> accData = mData->getAccountingData();
-+ time_t t;
-+ t = time(&t);
-+ accData->setEndTime(t);
-+
-+ if(B2bConfig::instance().getStr(B2bConfig::PP_OPTIONS)
-+ != B2bConfig::PP_FREE)
-+ {
-+ ///Send Stop records to billing
-+ int duration = t - accData->getStartTime();
-+ Sptr<BillingData> bData;
-+ bData.dynamicCast(myAAAData);
-+ assert(bData != 0);
-+ bData->setDuration(duration);
-+ bData->setTermCause(BT_SERVICE_UNAVAIL);
-+
-+ Sptr<AAAEvent> aEvent = new AAAEvent(this);
-+ cpLog(LOG_DEBUG, "AuthAgent::Sending Acct Stop");
-+ B2bFacade::instance().getAAATransceiver()->sendAcctStop(aEvent);
-+ }
-+ }
-+
- MultiLegCallControl::instance().receivedStatus(agent,msg);
- }
diff --git a/net/b2bua/files/patch-sip::b2b::B2bDef.hxx b/net/b2bua/files/patch-sip::b2b::B2bDef.hxx
deleted file mode 100644
index 214906f27acc..000000000000
--- a/net/b2bua/files/patch-sip::b2b::B2bDef.hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- sip/b2b/B2bDef.hxx 2003/01/19 18:01:33 1.1
-+++ sip/b2b/B2bDef.hxx 2003/01/19 18:02:05
-@@ -95,7 +95,8 @@
- {
- BT_NONE=0,
- BT_USER_REQ=1,
-- BT_SESSION_TIMEOUT=5
-+ BT_SESSION_TIMEOUT=5,
-+ BT_SERVICE_UNAVAIL=15
- };
-
- typedef vector<Sptr<UaBase> > UserAgentPeerList;
diff --git a/net/b2bua/files/patch-util::threads::VSemaphore.hxx b/net/b2bua/files/patch-util::threads::VSemaphore.hxx
deleted file mode 100644
index 5d6c6a0b39fe..000000000000
--- a/net/b2bua/files/patch-util::threads::VSemaphore.hxx
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- util/threads/VSemaphore.hxx.orig Tue Jun 25 20:01:25 2002
-+++ util/threads/VSemaphore.hxx Fri Apr 4 13:06:17 2003
-@@ -54,7 +54,7 @@
- static const char* const VSemaphore_hxx_version =
- "$Id: VSemaphore.hxx,v 1.4 2002/06/25 17:01:25 bko Exp $";
-
--#ifdef WIN32
-+#if defined(WIN32) || defined(__FreeBSD__)
- #include <pthread.h>
- #endif
-
diff --git a/net/b2bua/files/patch-util::transport::UdpStack.cxx b/net/b2bua/files/patch-util::transport::UdpStack.cxx
deleted file mode 100644
index bab283ef1c98..000000000000
--- a/net/b2bua/files/patch-util::transport::UdpStack.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
---- util/transport/UdpStack.cxx.orig Sun Oct 10 21:24:12 2004
-+++ util/transport/UdpStack.cxx Sun Oct 10 21:26:32 2004
-@@ -97,7 +97,10 @@
- #endif
-
- #ifdef __FreeBSD__
-+#include <sys/param.h>
-+#if __FreeBSD_version < 503001
- #include <isc/eventlib.h>
-+#endif
- #endif
-
- #ifdef __APPLE__
diff --git a/net/b2bua/pkg-descr b/net/b2bua/pkg-descr
deleted file mode 100644
index 9837fe0f00e0..000000000000
--- a/net/b2bua/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-B2bUa is basically two SIP UAs working back-to-back and thus controlling
-the calls going through it.Unlike a sip-proxy, a B2bUa will take an
-incoming call, modify it and present it in other form to final
-destination.B2bUa is in the call-signalling-path all the times.
-There are numerous applications in which b2bUa can be used either
-as a media negotiator or simply supervising the calls between two
-parties.
-
-WWW: http://www.vovida.org/applications/downloads/b2bua/
diff --git a/net/b2bua/pkg-plist b/net/b2bua/pkg-plist
deleted file mode 100644
index b644997e30de..000000000000
--- a/net/b2bua/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/b2bua
-etc/b2bConfig.xml.sample
-share/doc/b2bua/HOWTO
-share/doc/b2bua/HOWTO.PROV
-share/doc/b2bua/LICENSE
-share/doc/b2bua/b2bdesign.pdf
-@dirrm share/doc/b2bua
diff --git a/net/cap/Makefile b/net/cap/Makefile
deleted file mode 100644
index f200c744e67e..000000000000
--- a/net/cap/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-# New ports collection makefile for: cap
-# Date created: 09 Nov 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= cap
-PORTVERSION= 6.0.198
-PORTREVISION= 2
-CATEGORIES= net
-MASTER_SITES= ftp://munnari.OZ.AU/mac/:source \
- ftp://munnari.OZ.AU/mac/cap.patches/:patches
-DISTFILES= cap60.pl100.tar.Z:source \
- patches.101-126.tar.Z:patches patches.127-143.tar.Z:patches \
- patches.144-154.tar.Z:patches patches.155-162.tar.Z:patches \
- patches.163-182.tar.Z:patches patches.183-192.tar.Z:patches
-
-PATCH_SITES= ftp://munnari.OZ.AU/mac/cap.patches/
-PATCHFILES= cap60.patch193 cap60.patch194 cap60.patch195 cap60.patch196 \
- cap60.patch197 cap60.patch198
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Columbia AppleTalk Package for UNIX
-
-BROKEN= Broken with gcc 4.2
-DEPRECATED= does not compile on FreeBSD 7.x or newer
-EXPIRATION_DATE=2011-04-17
-
-NO_CDROM= Don't sell for profit
-WRKSRC= ${WRKDIR}/cap60
-DIST_SUBDIR= cap60
-ALL_TARGET= libsmade dummy-libinstall programs
-INSTALL_TARGET= include libinstall install
-
-CFLAGS+= -DUSESTRINGDOTH -DUSEDIRENT
-
-SUB_FILES= pkg-message
-
-MAN1= AUFS.1 ash.1 atlook.1 atprint.1 cvt2apple.1 getzones.1 \
- instappl.1 snitch.1
-MAN3= CAP.3
-MAN5= atalk.local.5 etalk.local.5
-MAN8= AUFS.8 CAP.8 UAB.8 aarpd.8 atis.8 lwsrv.8 papif.8
-MLINKS= atlook.1 atpinger.1 atlook.1 atlookws.1 \
- atprint.1 tlw.1 atprint.1 lwpr.1 \
- atprint.1 isrv.1 atprint.1 iwpr.1 \
- cvt2apple.1 cvt2cap.1 CAP.3 libcap.3 \
- CAP.3 libafpc.3 CAP.3 libafp.3 \
- papif.8 papof.8
-
-ETC_SAMPLES= etc/start-cap-servers extras/lib.cap.macusers \
- etc/list-cap-servers etc/kill-cap-servers \
- applications/papif/cap.printers
-LIB_SAMPLES= extras/afpfile applications/lwsrv/DBfile \
- applications/lwsrv/LWFonts applications/lwsrv/LWIIfgFonts \
- applications/lwsrv/LWPlusFonts applications/lwsrv/query.ps \
- applications/aufs/afpvols
-DOCDIR= ${PREFIX}/share/doc/cap
-DOCS1= abmisc.doc asp.notes atp.notes cap.auth.doc cap.notes \
- glossary install.ms iptalk.cookbook nbp.ext pap.notes \
- print.cookbook sched.notes uab.desc.ms uar.cookbook
-DOCS2= CAP.faq CAP60.README NOTICE README
-READMES= applications/papif applications/lwsrv applications/aufs \
- doc applications support/uab support/ethertalk
-
-.include <bsd.port.pre.mk>
-
-pre-patch:
- @(cd ${WRKSRC}; \
- for f in ../cap60.patch* ; do ${PATCH} -s -p < $$f ; done)
-post-patch:
- ${FIND} ${WRKSRC} -name Makefile.m4 -exec ${REINPLACE_CMD} -e 's/CFLAGS=/CFLAGS+=/' \{\} \;
- ${FIND} ${WRKSRC} -name "*.[chl]" -exec ${REINPLACE_CMD} -e 's/^#\([ ]*\)endif.*/#\1endif/g' -e 's/^#\([ ]*\)else.*/#\1else/g' \{\} \;
- ${GREP} -rl varargs\.h ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's/varargs\.h/stdarg\.h/g'
- ${REINPLACE_CMD} -e 's/S_ISREG(&stb) == 0/access(fn, R_OK) < 0/g' ${WRKSRC}/applications/lwsrv/procset.c
- ${REINPLACE_CMD} -E 's/long[ ](clock|idletime|l|lasttime|t|timeval|tloc)([ =0]*);/time_t \1\2;/g' \
- ${WRKSRC}/contrib/printqueue.c \
- ${WRKSRC}/etc/nisaux.c \
- ${WRKSRC}/samples/ash.c \
- ${WRKSRC}/support/uab/log.c \
- ${WRKSRC}/support/uab/uab.c \
- ${WRKSRC}/lib/cap/ablog.c \
- ${WRKSRC}/lib/cap/abpapc.c \
- ${WRKSRC}/applications/lwsrv/lwsrv.c \
- ${WRKSRC}/applications/aufs/aufs.c \
- ${WRKSRC}/applications/papif/papif.c
-
-pre-install:
- @${RM} -f ${WRKSRC}/libinstall
-
-post-install:
- @${MKDIR} ${PREFIX}/etc/cap
-.for f in ${ETC_SAMPLES}
- @${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/etc/cap/`${BASENAME} $f`.sample
-.endfor
- @${MKDIR} ${PREFIX}/lib/cap
-.for f in ${LIB_SAMPLES}
- @${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/lib/cap/`${BASENAME} $f`.sample
-.endfor
-.if !defined(NOPORTDOCS)
- @${ECHO_MSG} "===> Installing relevant documentation into ${DOCDIR}."
- @${MKDIR} ${DOCDIR}
-.for f in ${DOCS1}
- @${INSTALL_DATA} ${WRKSRC}/doc/$f ${DOCDIR}
-.endfor
-.for f in ${DOCS2}
- @${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}
-.endfor
-.for f in ${READMES}
- @${INSTALL_DATA} ${WRKSRC}/$f/README ${DOCDIR}/`${BASENAME} $f`.README
-.endfor
-.endif
- @${ECHO_MSG} "===> Installing manual pages."
-.for sect in 1 3 5 8
-.for man in ${MAN${sect}}
- @${INSTALL_MAN} ${WRKSRC}/man/${man} ${MAN${sect}PREFIX}/man/man${sect}
-.endfor
-.endfor
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/cap/distinfo b/net/cap/distinfo
deleted file mode 100644
index deed6c087eb2..000000000000
--- a/net/cap/distinfo
+++ /dev/null
@@ -1,26 +0,0 @@
-SHA256 (cap60/cap60.pl100.tar.Z) = 433d26393c823fd2bb07fa6350dc07c50d0f6c320a89c592eb08108c2831985c
-SIZE (cap60/cap60.pl100.tar.Z) = 1314774
-SHA256 (cap60/patches.101-126.tar.Z) = 4bce461dd8155ca7c812911871e040474726daeb42c4cf24e86b6770f8d17fc8
-SIZE (cap60/patches.101-126.tar.Z) = 98419
-SHA256 (cap60/patches.127-143.tar.Z) = 2ce5c895c6c59d258be5e8f93a55675e62da97bcc6798b309ddb45e63bcf779d
-SIZE (cap60/patches.127-143.tar.Z) = 46430
-SHA256 (cap60/patches.144-154.tar.Z) = 7855f8b8327e3ce5e5e7a021af9f35fa82013f3a86b344f3c28fde4d228f94f4
-SIZE (cap60/patches.144-154.tar.Z) = 77351
-SHA256 (cap60/patches.155-162.tar.Z) = 1e80619358ab698a33c61a640ac4fbb6f17d4f01797488fdddc536b853a28d40
-SIZE (cap60/patches.155-162.tar.Z) = 30300
-SHA256 (cap60/patches.163-182.tar.Z) = 810e1a65ef91c76b81a721c2f7766ece12c72db078b5ab76f56ac74605293d90
-SIZE (cap60/patches.163-182.tar.Z) = 91351
-SHA256 (cap60/patches.183-192.tar.Z) = 9c1858c999f31b87eed7bd5a49fc8a175db080b4c7928c6ef64ee5bca7f685c8
-SIZE (cap60/patches.183-192.tar.Z) = 86035
-SHA256 (cap60/cap60.patch193) = 2c3058f5d7e383fd385aabfe131cf6e6220ad7f98accc2ba2796d490ead7c186
-SIZE (cap60/cap60.patch193) = 137466
-SHA256 (cap60/cap60.patch194) = 03294c9f9185d13d818ba0a80dc6a4d3ad70c295ddfff58c61aefd67617c9c71
-SIZE (cap60/cap60.patch194) = 66059
-SHA256 (cap60/cap60.patch195) = 37532f36bfcf0643663c74d99af81dc91ed12588b4c845c79c59f652c3d49390
-SIZE (cap60/cap60.patch195) = 244197
-SHA256 (cap60/cap60.patch196) = 5f11b494d411fed9b46c31c4601724948787de54e4b16e47caaf29c0d33bbbe9
-SIZE (cap60/cap60.patch196) = 274402
-SHA256 (cap60/cap60.patch197) = db28a2f5233addf7ec9c86c9bf0aa45a20b309cf28eb20dc0be6570769f615d1
-SIZE (cap60/cap60.patch197) = 182418
-SHA256 (cap60/cap60.patch198) = 6144ac453bed9e2ed3f0199ce4e2db0c9c71b5ed0ff82e3c39e402e4907dbea5
-SIZE (cap60/cap60.patch198) = 155622
diff --git a/net/cap/files/m4.features b/net/cap/files/m4.features
deleted file mode 100644
index 154b64aff6a6..000000000000
--- a/net/cap/files/m4.features
+++ /dev/null
@@ -1,245 +0,0 @@
-# m4.features
-#
-# This file is used to determine the default set of additional features
-# that will be incorporated into CAP. These features have been contributed
-# by many people throughout the network community.
-#
-# Necessary preamble - please don't alter
-define(`concat',$1$2$3$4$5$6$7$8$9)
-define(`specialcflags',`')
-define(`aufsosflags',`')
-define(`simpleflags',`')
-define(`lwflags',`')
-#
-# To change the feature set, simply uncomment the wanted defines().
-# The Configure file will then use the customised version.
-# For more details, refer to the file 'CAP60.README'
-#
-# + SHORT_NAMES adds short name support to AUFS for AppleShare PC.
-# define(`specialcflags',concat(specialcflags,` -DSHORT_NAMES'))
-#
-# + NOCASEMATCH removes UNIX case sensitivity in AUFS (like Macs).
-# define(`specialcflags',concat(specialcflags,` -DNOCASEMATCH'))
-#
-# + SIZESERVER adds a daemon per AUFS server process for volume size info.
-# define(`specialcflags',concat(specialcflags,` -DSIZESERVER'))
-#
-# + LWSRV_AUFS_SECURITY provides printer security based on AUFS connection.
-# define(`specialcflags',concat(specialcflags,` -DLWSRV_AUFS_SECURITY'))
-#
-# + HIDE_LWSEC_FILE increases security of LWSRV_AUFS_SECURITY flag file
-# define(`aufsosflags',concat(aufsosflags,` -DHIDE_LWSEC_FILE'))
-# define(`lwflags',concat(lwflags,` -DHIDE_LWSEC_FILE'))
-#
-# + LWSRV_LPR_LOG causes stdout/stderr lpr output to be included in lwsrv log
-define(`specialcflags',concat(specialcflags,` -DLWSRV_LPR_LOG'))
-#
-# + AUTHENTICATE turn on alternate AUFS/LWSRV authentication method
-# define(`specialcflags',concat(specialcflags,` -DAUTHENTICATE'))
-#
-# + STAT_CACHE causes critical AUFS stat() calls to be cached.
-define(`specialcflags',concat(specialcflags,` -DSTAT_CACHE'))
-#
-# + TREL_TIMEOUT causes an extra TREL timeout listener to run to avoid timeouts
-# define(`specialcflags',concat(specialcflags,` -DTREL_TIMEOUT'))
-#
-# + RUTGERS includes local modifications for Rutgers University
-# define(`specialcflags',concat(specialcflags,` -DRUTGERS'))
-#
-# + MELBOURNE includes local modifications for Melbourne University
-# define(`specialcflags',concat(specialcflags,` -DMELBOURNE'))
-#
-# + USE_HOST_ICON provides automatic aufs ICON selection on supported hosts
-# define(`specialcflags',concat(specialcflags,` -DUSE_HOST_ICON'))
-#
-# + PERMISSIVE_USER_NAME allows AUFS users to have their real name in Chooser
-# define(`specialcflags',concat(specialcflags,` -DPERMISSIVE_USER_NAME'))
-#
-# + ULTRIX_SECURITY adds ULTRIX enhanced security to aufs
-# define(`specialcflags',concat(specialcflags,` -DULTRIX_SECURITY'))
-#
-# + DIGITAL_UNIX_SECURITY adds OSF/1 enhanced security to aufs
-# define(`specialcflags',concat(specialcflags,` -DDIGITAL_UNIX_SECURITY'))
-#
-# + USING_FDDI_NET adds support for FDDI networks (Digital UNIX/Ultrix only)
-# define(`specialcflags',concat(specialcflags,` -DUSING_FDDI_NET'))
-#
-# + USE_MAC_DATES maintains Mac Create/Modify dates on file copy
-# define(`specialcflags',concat(specialcflags,` -DUSE_MAC_DATES'))
-#
-# + DEV_NIT specifies alternate NIT device name (default "/dev/nit")
-# define(`specialcflags',concat(specialcflags,` -DDEV_NIT=\"/dev/nit\"'))
-#
-# + APPLICATION_MANAGER control the use of designated applications
-# define(`specialcflags',concat(specialcflags,` -DAPPLICATION_MANAGER'))
-#
-# + AUFS_README links readme file into new user's top level
-# define(`specialcflags',concat(specialcflags,` -DAUFS_README'))
-#
-# + ULT42PFBUG unpatched ULTRIX 4.2 packet filter workaround (also need COPYALL)
-# define(`specialcflags',concat(specialcflags,` -DULT42PFBUG'))
-#
-# + AUFS_IDLE_TIMEOUT will disconnect idle AUFS sessions (-[i|I] period)
-# define(`specialcflags',concat(specialcflags,` -DAUFS_IDLE_TIMEOUT'))
-#
-# + REREAD_AFPVOLS kill -USR1 will make parent aufs re-read system vols file
-define(`specialcflags',concat(specialcflags,` -DREREAD_AFPVOLS'))
-#
-# + PASS_THRU pass through LWSRV jobs with no adobe preprocessing (for PCs)
-# define(`specialcflags',concat(specialcflags,` -DPASS_THRU'))
-#
-# + DONT_PARSE pass through LWSRV jobs with no adobe preprocessing at all
-# define(`specialcflags',concat(specialcflags,` -DDONT_PARSE'))
-#
-# + XDEV_RENAME allow files to be moved over cross device links
-# define(`specialcflags',concat(specialcflags,` -DXDEV_RENAME'))
-#
-# + USR_FILE_TYPES user defined file suffix to creator/type/xlate mapping
-define(`specialcflags',concat(specialcflags,` -DUSR_FILE_TYPES'))
-#
-# + CREATE_AFPVOL create user .afpvols and 'mac' directories if non-existent
-define(`specialcflags',concat(specialcflags,` -DCREATE_AFPVOL=\"mac\"'))
-#
-# + CREAT_AFPVOL_NAM customize name for the volume (modifies CREATE_AFPVOL)
-# (CREAT_AFPVOL_NAM fmt string: %U user, %H host, %V vol, %D home eg: "%U@%H")
-# define(`specialcflags',concat(specialcflags,` -DCREAT_AFPVOL_NAM="\"%U\""'))
-#
-# + ISO_TRANSLATE use Macintosh/ISO 8859 character translation on I/O
-# define(`specialcflags',concat(specialcflags,` -DISO_TRANSLATE'))
-#
-# + ISO_FILENAMES extend ISO translation to filenames (assumes ISO_TRANSLATE)
-# define(`specialcflags',concat(specialcflags,` -DISO_FILENAMES'))
-#
-# + ISO_FILE_TRANS use ISO translation on unix/TEXT file contents
-# define(`specialcflags',concat(specialcflags,` -DISO_FILE_TRANS'))
-#
-# + DENYREADWRITE implement AUFS read/write access and deny modes
-# define(`specialcflags',concat(specialcflags,` -DDENYREADWRITE'))
-#
-# + STEAL_PORTS extends DDP dynamic skts down into experimental range 64-128
-# (WARNING!!: Requires uar.1.0.patch11 or uar.1.1.patch09 for use with UAR)
-# define(`specialcflags',concat(specialcflags,` -DSTEAL_PORTS'))
-#
-# + USESYSLOG sends PAPIF Information, Warning & Debug messages to syslog()
-# define(`specialcflags',concat(specialcflags,` -DUSESYSLOG'))
-#
-# + NOCAPDOTPRINTERS uses /etc/lp/printers/<lw>/comment instead of cap.printers
-# (Note: intended for use with Solaris 2.N only)
-# define(`specialcflags',concat(specialcflags,` -DNOCAPDOTPRINTERS'))
-#
-#
-# AUFS definable options (previously required editing m4.setup)
-#
-# + FIXED_DIRIDS compile server and AUFS code for fixed directory & file IDs
-# define(`specialcflags',concat(specialcflags,` -DFIXED_DIRIDS'))
-#
-# + DISTRIB_PASSWDS use ~/.afppass for encrypted passwords (see CAP60.README)
-# define(`specialcflags',concat(specialcflags,` -DDISTRIB_PASSWDS'))
-#
-# + AFP_DISTPW_PATH alternate directory for .afppass files (not in ~user)
-# define(`specialcflags',concat(specialcflags,` -DAFP_DISTPW_PATH=\"/etc/dp\"'))
-#
-# + AFP_DISTPW_MODE enforced .afppass mode (must be 0644 for NFS mounted dirs)
-# define(`specialcflags',concat(specialcflags,` -DAFP_DISTPW_MODE=0600'))
-#
-# + DEBUG_AFP_CMD write detailed AUFS AFP debugging info to -Z specified file
-# define(`specialcflags',concat(specialcflags,` -DDEBUG_AFP_CMD'))
-#
-# + PID_FILE write an aufs process-ID file
-define(`specialcflags',concat(specialcflags,` -DPID_FILE=\"/var/run/aufs.pid\"'))
-#
-# + CLOSE_LOG_SIG close and reopen the aufs log on signal -USR2
-# define(`specialcflags',concat(specialcflags,` -DCLOSE_LOG_SIG=SIGUSR2'))
-#
-# + LOG_WTMP add entry to the 'wtmp' file for each AUFS connection (not IRIX4)
-define(`aufsosflags',concat(aufsosflags,` -DLOG_WTMP'))
-#
-# + LOG_WTMP_FILE specify name of alternate wtmp file for LOG_WTMP feature
-define(`aufsosflags',concat(aufsosflags,` -DLOG_WTMP_FILE=\"/var/log/wtmp\"'))
-#
-# + ADMIN_GRP allows users in specified UNIX group to login as AUFS superuser
-# define(`aufsosflags',concat(aufsosflags,` -DADMIN_GRP=\"macadm\"'))
-#
-# + NONLXLATE for aufs
-# define(`aufsosflags',concat(aufsosflags,` -DNONLXLATE'))
-#
-# + FULL_NCS_SUPPORT (National Character Support) for aufs
-# define(`aufsosflags',concat(aufsosflags,` -DFULL_NCS_SUPPORT'))
-#
-# + NCS_ALL_TEXT perform specified translation on any TEXT file
-# define(`aufsosflags',concat(aufsosflags,` -DNCS_ALL_TEXT'))
-#
-# + GGTYPE="gid_t" (group ID type) for AUFS
-# define(`aufsosflags',concat(aufsosflags,` -DGGTYPE="gid_t"'))
-#
-# + NOCHGRPEXEC don't exec chgrp, just use chown(2) 3rd arg. [Not for Sys V]
-# define(`aufsosflags',concat(aufsosflags,` -DNOCHGRPEXEC'))
-#
-# + USEDIRSETGID set group ID bit on non-primary group dirs [SunOS/Sys V]
-# define(`aufsosflags',concat(aufsosflags,` -DUSEDIRSETGID'))
-#
-# + NETWORKTRASH fix permissions on network trash stuff
-define(`aufsosflags',concat(aufsosflags,` -DNETWORKTRASH'))
-#
-# + SHADOW_PASSWD add support for shadow password files if supported
-# define(`aufsosflags',concat(aufsosflags,` -DSHADOW_PASSWD'))
-#
-# + LOGIN_AUTH_PROG AUFS -L option specifies external authorization program
-# define(`aufsosflags',concat(aufsosflags,` -DLOGIN_AUTH_PROG'))
-#
-# + USEQUOTA forces usage of ufs quotas [Solaris 2.x only]
-# note: check if you applied ufs quota patch:
-# 100833-xx for Solaris 2.1
-# 101039-xx for Solaris 2.2
-# define(`aufsosflags',concat(aufsosflags,` -DUSEQUOTA'))
-#
-#
-# LWSRV definable options (previously required editing m4.setup)
-#
-# + LPRARGS passes arguments on lwsrv command line directly to lpr
-# define(`lwflags',concat(lwflags,` -DLPRARGS'))
-#
-# + DOCNAME adds document name as a part of job name to lpr
-# define(`lwflags',concat(lwflags,` -DDOCNAME'))
-#
-# + LPRCMD redefine BSD lpr to use alternate path
-# define(`lwflags',concat(lwflags,` -DLPRCMD=\"/usr/local/bin/lpr\"'))
-#
-# + TEMPFILE set alternative path for lwsrv spool files (default /tmp)
-# define(`lwflags',concat(lwflags,` -DTEMPFILE=\"/usr/tmp/lwsrvXXXXXX\"'))
-#
-# + USELPRSYM add -s (symlink) option to lwsrv lpr call (not for OSF/1)
-# define(`lwflags',concat(lwflags,` -DUSELPRSYM'))
-#
-# + USESYSVLP required for HP-UX (and probably other System V) spooling
-# define(`lwflags',concat(lwflags,` -DUSESYSVLP'))
-#
-# + PAGECOUNT adds page count to job name (value is internal buffer size)
-# define(`lwflags',concat(lwflags,` -DPAGECOUNT=512'))
-# define(`simpleflags',concat(simpleflags,` -DPAGECOUNT=512'))
-#
-# + ADOBE_DSC2_CONFORMANT forces Adobe DSC2 conformance
-# define(`simpleflags',concat(simpleflags,` -DADOBE_DSC2_CONFORMANT'))
-#
-# + PROCSET_PATCH delete PatchPrep header for non-Apple LaserWriters
-# define(`simpleflags',concat(simpleflags,` -DPROCSET_PATCH'))
-#
-# + RUN_AS_USER run lpd job as Chooser Name if valid UNIX account (no authent)
-define(`lwflags',concat(lwflags,` -DRUN_AS_USER'))
-#
-# + USER_REQUIRED (requires RUN_AS_USER) refuse printing if Chsr name invalid
-define(`lwflags',concat(lwflags,` -DUSER_REQUIRED'))
-#
-#
-# PAPIF options
-#
-# + DUPLEXMODE tell suitably equipped printer to print on both sides of a page
-# define(`specialcflags',concat(specialcflags,` -DDUPLEXMODE'))
-#
-# + TRANS3 add support for TranScript 3.0 'psdman' (instead of pstext)
-# define(`specialcflags',concat(specialcflags,` -DTRANS3'))
-#
-# + PSJOBHEADER send PS header in file specified in env. variable "PSJOBHEADER"
-# define(`specialcflags',concat(specialcflags,` -DPSJOBHEADER'))
-#
-#
diff --git a/net/cap/files/m4.setup.in b/net/cap/files/m4.setup.in
deleted file mode 100644
index f25d7cb0b4c7..000000000000
--- a/net/cap/files/m4.setup.in
+++ /dev/null
@@ -1,543 +0,0 @@
-define(`concat',$1$2$3$4$5$6$7$8$9)
-changequote([,])
-
-# os - one of:
-# "bsd" - bsd 4.2, bsd 4.3, ultrix 1.1, acis 4.2,4.3 other
-# "standard" bsd systems without nfs
-# "ultrix12" - Ultrix 1.2
-# "ultrix20" - Ultrix 2.0 or greater
-# "ultrix40" - Ultrix 4.0 or greater
-# "osf1" - OSF/1 1.3 or greater
-# "hpux" - HP/UX
-# "aux" - A/UX
-# "uts" - Amdahl UTS
-# "xenix5" - SCO Xenix System V
-# "aix" - IBM AIX System V
-# "pyr" - pyramid (in BSD universe)
-# "sunos" - SunOS 4.N or less
-# "solaris" - Solaris 2.N (SunOS 5.0 and greater)
-# "encore" - Encore MultiMax
-# "next" - NeXT/MACH
-# "dynix" - Sequent Balance
-# "irix" - Silicon Graphics IRIS-4D/IRIX
-# "newsos" - Sony NEWS
-# "drsnx" - ICL DRS/NX V4.0
-# "epix" - Control Data EP/IX
-# "386bsd" - 386/BSD and derivatives
-# "netbsd" - NetBSD 1.0
-# "freebsd" - FreeBSD 2.0
-# "bsdi" - BSDI BSD/386 1.1
-# "domainosbsd" - HP/Apollo Domain BSD 4.3
-# Warning: hpux, pyr are hardcoded in some of the makefiles (sorry)
-
-# MAJOR CONFIGURATION
-# set to one of the above (or configure your own below)
-define([os],[[freebsd]])
-
-# System call configuration (not for system v compatibilty)
-# known: X_GETOPT, X_VPRINTF, X_GETMNT, X_STATFS, X_QUOTA,
-# X_SUNQUOTA, X_FLOCK, X_LOCKF, X_FCNTLLOCKF
-# getopt - "cap: argument processing"
-define([X_GETOPT],1)
-# getmnt - "aufs: info on file systems (dec)"
-# define([X_GETMNT],1)
-# statvfs - "aufs: info on file systems (solaris)"
-# define([X_STATFS],1)
-# statfs - "aufs: info on file systems (sun nfs)"
-# define([X_STATFS],1)
-# statfs - "aufs: info on file systems (irix,domainos)"
-# define([X_STATFS],1)
-# statfs - "aufs: info on file systems (bsd44)"
-define([X_STATFS],1)
-# quota - "aufs: info on user quota"
-# define([X_QUOTA],1)
-# ioctl - "aufs: info on user quota (solaris)"
-# define([X_QUOTA],1)
-# getmntent - "aufs: used by sunquota"
-# define([X_SUNQUOTA],1)
-# quotactl - "aufs: used by bsdquota"
-# define([X_BSDQUOTA],1)
-# flock - "afp: file locking"
-define([X_FLOCK],1)
-# lockf - "afp: byte range locking using unistd.h"
-# define([X_LOCKF],1)
-# lockf - "afp: byte range locking using fcntl.h"
-# define([X_FCNTLLOCKF],1)
-# vfprintf - "cap: variable arg fprintf"
-define([X_VPRINTF],1)
-# recvmsg - "cap: lib: scatter gather recv"
-# define([X_NORECVMSG],1)
-# sendmsg - "cap: lib: scatter gather send"
-# define([X_NOSENDMSG],1)
-# ffs - "cap: lib: ffs - find first set bit"
-# define([X_NOFFS],1)
-
-# GETOPT support
-ifdef([X_GETOPT],[],[define([needgetopt],[att_getopt.o])])
-# VPRINTF support
-ifdef([X_VPRINTF],[define([usevprintf], 1)],[])
-
-# Path to cap sources: useful for testing
-define([cwd],[@CWD@])
-# turn on if your system sends packets very quickly
-# (see applications/aufs/INSTALLATION)
-# define([fastether],1) # For papif and samples
-
-# The following selects the correct lap delivery objects
-define([lapobj],[abetalk.o abddp.o abnbp.o atalkdbm.o])
-
-# This determines what happens to UAB and UAR
-define([uabprogs],[])
-define([uabplibs],[])
-define([uabpobjs],[])
-
-# This sets up Native EtherTalk support
-define([etherprogs],[aarpd])
-define([etherpobjs],[bpfiltp.o])
-
-# This sets up capd
-define([capdprogs],[])
-define([capdpobjs],[])
-
-# And this determines if Phase 2 packets are used
-define([usephase2],1)
-
-# The following selects byteswapping or otherwise
-define([usebyteswap],1)
-
-# We use build_here to restrict CAP to a single directory tree
-# but still using etcdest (see below) for the location of atalk.local
-# and other configuration files
-# define([build_here],1)
-
-# We use the debug flag to restrict CAP to a single directory tree
-# for testing purposes, e.g. testing new versions
-# define([debug],1)
-
-# The includef flag sets an alternate localtion for include files
-define([includef],1)
-
-# Systems with kernel AppleTalk support do not need atis
-define([useatis],1)
-
-# uncomment if your param.h includes types.h and types.h doesn't
-# prevent itself from being included twice
-# define _TYPES
-# define([selfdefinetypes],1)
-# MINOR CONFIGURATION: configure various programs
-
-#define([columbia],1) # so columbia can do things quickly
-#define([rutgersdef],1) # so rutgers can do things quickly
-
-# Installation prefix
-define([prefix],[[@PREFIX@]])
-
-# location of include files
-define([includedest],concat(prefix,[[[/include]]]))
-ifelse(os,[epix],[define([includedir],[[/bsd43/usr/include]])])
-# location of des subroutine source (see lib/afp/README)
-define([desloc],[[../../extras]])
-# location of atalk.local, etc.
-define([etcdest],concat(prefix,[/etc/cap]))
-ifdef([columbia],[define([etcdest],[[/usr/local/lib/cap]])])
-# location of user cap programs
-define([capdestdir],concat(prefix,[/bin]))
-# location of cap "server" programs (aufs, lwsrv, papif, uab etc.)
-define([capsrvrdestdir],concat(prefix,[/sbin]))
-# location of some cap data files
-define([caplibdestdir],concat(prefix,[/lib/cap]))
-ifdef([rutgersdef],[define([caplibdestdir],[[/usr/local/cap/lib]])])
-# location of cap libraries
-define([libdestdir],concat(prefix,[/lib]))
-# override for aux (doesn't search /usr/local/lib)
-ifelse(os,[aux],[define([libdestdir],[[/usr/lib]])])
-# cap library names
-define([caplib],[[libcap.a]])
-define([afplib],[[libafp.a]])
-define([afpclib],[[libafpc.a]])
-# names to load cap libraries with
-define([libcap],[[-lcap]])
-define([libafp],[[-lafp]])
-define([libafpc],[[-lafpc]])
-ifelse(os,[encore],
- [define([libcap],concat([-L],libdestdir,[ ],libcap))])
-ifelse(os,[encore],
- [define([libafp],concat([-L],libdestdir,[ ],libafp))])
-ifelse(os,[encore],
- [define([libafpc],concat([-L],libdestdir,[ ],libafpc))])
-ifelse(os,[aix],
- [define([libcap],concat([-L],libdestdir,[ ],libcap))])
-ifelse(os,[aix],
- [define([libafp],concat([-L],libdestdir,[ ],libafp))])
-ifelse(os,[aix],
- [define([libafpc],concat([-L],libdestdir,[ ],libafpc))])
-ifelse(os,[hpux],
- [define([libcap],concat([-L],libdestdir,[ ],libcap))])
-ifelse(os,[hpux],
- [define([libafp],concat([-L],libdestdir,[ ],libafp))])
-ifelse(os,[hpux],
- [define([libafpc],concat([-L],libdestdir,[ ],libafpc))])
-ifelse(os,[epix],
- [define([libcap],concat([-L],libdestdir,[ ],libcap))])
-ifelse(os,[epix],
- [define([libafp],concat([-L],libdestdir,[ ],libafp))])
-ifelse(os,[epix],
- [define([libafpc],concat([-L],libdestdir,[ ],libafpc))])
-ifelse(os,[solaris],
- [define([libcap],concat([-L],libdestdir,[ ],libcap))])
-ifelse(os,[solaris],
- [define([libafp],concat([-L],libdestdir,[ ],libafp))])
-ifelse(os,[solaris],
- [define([libafpc],concat([-L],libdestdir,[ ],libafpc))])
-ifelse(os,[netbsd],
- [define([libcap],concat([-L],libdestdir,[ ],libcap))])
-ifelse(os,[netbsd],
- [define([libafp],concat([-L],libdestdir,[ ],libafp))])
-ifelse(os,[netbsd],
- [define([libafpc],concat([-L],libdestdir,[ ],libafpc))])
-ifelse(os,[freebsd],
- [define([libcap],concat([-L],cwd,[/lib/cap],[ ],libcap))])
-ifelse(os,[freebsd],
- [define([libafp],concat([-L],cwd,[/lib/afp],[ ],libafp))])
-ifelse(os,[freebsd],
- [define([libafpc],concat([-L],cwd,[/lib/afpc],[ ],libafpc))])
-# any special libraries
-define([libspecial],[])
-ifelse(os,[ultrix40],[
- define([libspecial],concat(libspecial,[ -lauth]))])
-ifelse(os,[osf1],[
- define([libspecial],concat(libspecial,[ -lsecurity]))])
-ifelse(os,[xenix5],[
- define([libspecial],concat(libspecial,[ -lsocket]))])
-ifelse(os,[drsnx],[
- define([libspecial],concat(libspecial,[ -lucb]))])
-ifelse(os,[uts],[
- define([libspecial],concat(libspecial,[ -lsocket -lbsd -la]))])
-ifelse(os,[dynix],[
- define([libspecial],concat(libspecial,[ -lseq]))])
-ifelse(os,[irix],[
- define([libspecial],concat(libspecial,[ -lbsd]))])
-ifelse(os,[aix],[
- define([libspecial],concat(libspecial,[ -lbsd]))])
-ifelse(os,[aux],[
- define([libspecial],concat(libspecial,[ -lat -lbsd]))])
-ifelse(os,[hpux],[
- define([libspecial],concat(libspecial,[ -lBSD -lndbm]))])
-ifelse(os,[epix],[
- define([libspecial],concat(libspecial,[ -lc -lsec]))])
-ifelse(os,[386bsd],[
- define([libspecial],concat(libspecial,[ -lrpc]))])
-ifelse(os,[netbsd],[
- define([libspecial],concat(libspecial,[ -lcrypt]))])
-ifelse(os,[freebsd],[
- define([libspecial],concat(libspecial,[ -lcrypt]))])
-ifelse(os,[bsdi],[
- define([libspecial],concat(libspecial,[ -lrpc -lkvm]))])
-ifelse(os,[linux],[
- define([libspecial],concat(libspecial,[ -lgdbm]))])
-ifelse(os,[solaris],[
- define([libspecial],concat(libspecial,[ -lsocket -lnsl ]))])
-# rutgers specific
-define([libru],[])
-ifdef([rutgersdef], [
-ifelse(os,[solaris],[
- define([libru],concat(libru,[ -L/usr/local/lib -R/usr/local/lib -lru ]))],[
- define([libru],concat(libru,[ -lru ]))])])
-
-#
-# special configurations for individual source files
-#
-
-#
-# Aufs: see applications/aufs/INSTALLATION
-#
-# WARNING: OS DEPENDENT
-# define([smartunixfinderinfo],1)
-#
-# Set -DNONLXLATE, -DFULL_NCS_SUPPORT, -DGGTYPE="gid_t" or -DNOCHGRPEXEC
-# in m4.features
-# Others: USESTATFS, USEGETMNT, USECHOWN, USEQUOTA, USESUNQUOTA, USEBSDQUOTA
-# are autoconfigured
-define([aufsosdefs],[aufsosflags()])
-
-#
-# lib/cap/authenticate.c: configuration file
-#
-define([authconfig],concat([\"],etcdest,[/],[cap.auth],[\"]))
-
-#
-# lwsrv: see applications/lwsrv/README
-#
-# lwflags and simpleflags are now defined in m4.features
-
-#
-# lwrename: set name of file containing list of printers to be renamed
-#
-define([lwrenamefile],concat([\"],caplibdestdir,[/lwrename.list\"]))
-
-#
-# papif: see applications/papif/README
-#
-# uncomment and set to right location to turn on printing "plain text files"
-# define([pstextloc],[[\"/usr/local/lib/ps/pstext\"]])
-#
-# uncomment and set to right location to turn on page reversal
-# define([psrevloc],[[\"/usr/local/lib/ps/psrev\"]])
-#
-# Valid are:
-# -DVERBOSELOG - default (set =0 to turn off)
-# -DNO_STRUCT - default is on (structured)
-# -DNOACCT - default is on (accounting)
-# -DIDLESTUFF - default is off
-# -DSFLOWQ - default is 8 (min 1, max 8)
-# -DRFLOWQ - default is 8 (min 1, max 8)
-# -DATPRESPONSETIMEOUT - default is 120 (2 minutes) - in seconds
-# -DWATCHTIME - default is 10 seconds (in seconds)
-# -DDEBUG - default is off
-# -DSTRIPCONTROLD - default is off
-# -DMAPCRTOLF - default is off
-# -DMACUSER - default is off (need LPD_JOB environment variable in lpd)
-# -DPLP - Use with PLP rather than Berkeley lpd
-# see papif README file for explanations of the above
-# The following defines are recommended for System V lp printers (vs. bsd lpd)
-# -DWATCHTIME=0 (no status) -DNOACCT
-define([papflags],[-DMACUSER])
-define([papflags],concat(papflags,[ -DIDLESTUFF]))
-
-# Set -DBANNERFIRST if you want the banner page to come out as the
-# first page instead of the last page
-# Set -DBANNERLAST if want it last
-# Set -DPSBANNER if you want a custom PostScipt Banner (must specify
-# short banners in printcap). This still defaults to regular banners
-# Add -DCHARGEBANNER if you want to charge the banner page to the user
-# on system V - there is no accounting, so leave blank
-define([papbanner],[-DCHARGEBANNER])
-
-# for cap.printers - uncomment and change the following line to point
-# papif, et. al. to a location other than /etc/cap.printers. (Note:
-# line below would set it to $etcdest/cap.printers)
-define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))
-ifdef([columbia],
- [define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))])
-# for atalkdbm - allows change following line(s) to modify atalk.local
-# (probably shouldn't). Remember that atalk.local is expected to
-# be in etcdest
-define([atalklocal],concat([\"],etcdest,[/],[atalk.local],[\"]))
-define([etalklocal],concat([\"],etcdest,[/],[etalk.local],[\"]))
-define([configdir],concat([\"],etcdest,[\"]))
-define([uabpidfile],concat([\"],caplibdestdir,[/],[uab.pid],[\"]))
-define([uabbrdescr],concat([\"],caplibdestdir,[/],[bridge_desc],[\"]))
-
-# in case you want to globally change the c compiler
-define([thecompiler],[cc])
-define([theloader],[ld])
-define([theinstaller],[cp])
-
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-# END OF CONFIGABLE OPTIONS #
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-# You should only edit past here if you are "porting"
-# Automatics
-define([osname],[Unknown])
-ifelse(os,[ultrix12],[define([osname],[Ultrix 1.2])])
-ifelse(os,[ultrix20],[define([osname],[Ultrix 2.0])])
-ifelse(os,[ultrix40],[define([osname],[Ultrix 4.0])])
-ifelse(os,[osf1],[define([osname],[OSF/1])])
-ifelse(os,[aux],[define([osname],[A/UX])])
-ifelse(os,[sunos],[define([osname],[SunOS])])
-ifelse(os,[solaris],[define([osname],[Solaris 2.x in native SVR4 mode])])
-ifelse(os,[encore],[define([osname],[Encore Umax])])
-ifelse(os,[hpux],[define([osname],[HP-UX (for 9000 series)])])
-ifelse(os,[uts],[define([osname],[Amdahl UTS])])
-ifelse(os,[bsd],[define([osname],[Standard BSD])])
-ifelse(os,[pyr],[define([osname],[Pyramid in BSD universe])])
-ifelse(os,[xenix5],[define([osname],[SCO Xenix System V])])
-ifelse(os,[aix],[define([osname],[IBM AIX System V])])
-ifelse(os,[next],[define([osname],[NeXT/MACH])])
-ifelse(os,[dynix],[define([osname],[Sequent Balance])])
-ifelse(os,[irix],[define([osname],[Silicon Graphics IRIS/IRIX])])
-ifelse(os,[newsos],[define([osname],[Sony NEWS])])
-ifelse(os,[drsnx],[define([osname],[ICL DRS])])
-ifelse(os,[epix],[define([osname],[Control Data EP/IX])])
-ifelse(os,[386bsd],[define([osname],[386/BSD etc])])
-ifelse(os,[netbsd],[define([osname],[NetBSD 1.0])])
-ifelse(os,[freebsd],[define([osname],[FreeBSD])])
-ifelse(os,[bsdi],[define([osname],[BSD/386])])
-ifelse(os,[domainosbsd],[define([osname],[HP/Apollo Domain BSD 4.3])])
-#
-define([cflags],ifdef([selfdefinetypes],[-D_TYPES],[]))
-define([cflags],concat(cflags,ifdef([usebyteswap],[ -DBYTESWAPPED],[])))
-define([cflags],concat(cflags,ifdef([usephase2],[ -DPHASE2],[])))
-define([bigcflags],ifelse(os,[hpux],[]))
-# The encore optimiser is slightly over zealous
-ifelse(os,[encore],[define([cflags],concat(cflags,[ -Dencore]))],[
- define([cflags],concat(cflags,[ -O]))])
-ifelse(os,[pyr],[
- define([cflags],concat(cflags,[ -q]))])
-ifelse(os,[next],[
- define([cflags],concat(cflags,[ -DNeXT -DADDRINPACK]))])
-ifelse(os,[xenix5],[
- define([cflags],concat(cflags,[ -Dxenix5 -I$I -DLAI_TCP -Di386]))])
-ifelse(os,[aix],[
- define([cflags],concat(cflags,[ -DAIX -DUSETIMES -DNOWAIT3 -DUSEDIRENT]))])
-ifelse(os,[solaris],[
- define([cflags],concat(cflags,[ -DSOLARIS]))])
-ifelse(os,[uts],[
- define([cflags],concat(cflags,[ -eft ]))])
-ifelse(os,[irix],[
- define([cflags],concat(cflags,[ -cckr -D_BSD_COMPAT]))])
-ifelse(os,[drsnx],[
- define([cflags],concat(cflags,[ -DNOWAIT3]))])
-ifelse(os,[epix],[
- define([cflags],concat(cflags,[ -DEPIX]))])
-ifelse(os,[osf1],[
- define([cflags],concat(cflags,[ -DUSEDIRENT]))])
-ifelse(os,[netbsd],[
- define([cflags],concat(cflags,[ -D__386BSD__]))])
-ifelse(os,[bsdi],[
- define([cflags],concat(cflags,[ -D__386BSD__]))])
-ifelse(os,[linux],[
- define([cflags],concat(cflags,[ -DUSE_GDBM]))])
-
-# was used for nbp, but found we needed more... leave in case
-define([nbpflags],[])
-define([lflags],[])
-define([mflags],[])
-
-# aux's c compiler isn't nice - it doesn't have a preprocessor
-# definition for aux. So, let's invent one. Also turn on -n
-# for shared code.
-ifelse(os,[aux],[
- define([cflags],concat(cflags,[ -n -Daux]))
- define([lflags],concat(lflags,[ -n]))])
-
-# for NetBSD 1.0 on 68k strip symbols to avoid ld error on some progs
-ifelse(os,[netbsd],[define([lflags],concat(lflags,[ -s]))])
-
-# use the transitional option of the C compiler - interpret as K&R C, not ANSI
-ifelse(os,[drsnx],[
- define([cflags],concat(cflags,[ -Xt -Ddrsnx]))])
-
-# check to see if we need sysvinstall usage
-ifelse(os,[hpux6],[define([sysvinstall],[yes])],
- os,[irix3],[define([sysvinstall],[yes])])
-
-# or if we really want to use install
-# ifelse(os,[someOS], [define([theinstaller],[install])])
-
-# for cap library
-# Valid are:
-# NOFFS - no ffs function defined, fake it out
-# LOCALTIME_GTOD - uses pd localtime, but gettimeofday always reads
-# disk based time of day. Always defined for AUX for now. Probably
-# needs to be changed for versions of Aux after 1.0
-# NORECVMSG - no recvmsg in system (fake it out)
-# NOSENDMSG - no recvmsg in system (fake it out)
-define([caposdefs],
- concat( ifdef([X_NOFFS],[ -DNOFFS],[]),
- ifelse(os,[aux],[ -DLOCALTIME_GTOD],[]),
- ifdef([X_NORECVMSG], [ -DNORECVMSG],[]),
- ifdef([X_NOSENDMSG], [ -DNOSENDMSG],[])))
-# for afp library
-# two cases for X_LOCKF - if lockf isn't defined
-# first: X_FCNTLLOCKF is defined, so just note that lockf uses fcntl.h
-# second: " " isn't defined so define no lockf
-# we "know" that flock() was hiding in libbsd.a under aix
-define([afposdefs],
- concat( ifdef([X_FLOCK],[], ifelse(os,[aix],[],[ -DNOFLOCK])),
- ifdef([X_LOCKF],[],
- [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL],
- ifelse(os,[freebsd],[ -DUSEFCNTLLOCK],[ -DNOLOCKF]))])))
-# for aufs
-define([aufsosdefs],
- concat(aufsosdefs,
- ifdef([X_STATFS],[ -DUSESTATFS],[]),
- ifdef([X_GETMNT],[ -DUSEGETMNT],[]),
- ifdef([X_QUOTA],[ -DUSEQUOTA],[]),
- ifdef([X_SUNQUOTA],[ -DUSESUNQUOTA],[]),
- ifdef([X_BSDQUOTA],[ -DUSEBSDQUOTA],[]),
- ifelse(os,[irix],[ -DNOVFORK]),
- ifelse(os,[aix],[ -DNOVFORK -DUSECHOWN],[])))
-
-# if no ranlib (or fakeout like hpux) and need to order libaries
-ifelse(os,[dummy], [define(uselordertsort,[1])],
- os,[aux], [define(uselordertsort,[1])],
- os,[solaris], [define(uselordertsort,[1])],
- os,[uts], [define(uselordertsort,[1])],
- os,[drsnx], [define(uselordertsort,[1])],
- os,[irix], [define(uselordertsort,[1])])
-
-# lw config
-define([lwflags],
- concat(lwflags,
- ifdef([fastether],[ -DSFLOWQ=1],[]),
- ifelse(os,[aix],[],[])))
-
-# more papif config
-define([papflags],
- concat(papflags,
- ifelse(os,[irix],[ -DNOVFORK]),
- ifelse(os,[aix],[ -DNOVFORK],[])))
-
-#NBPFLAGS = nbpflags()
-#SPECCFLAGS = specialcflags()
-#BIGCFLAGS = bigcflags()
-#CFLAGS = cflags()
-#LFLAGS = lflags()
-#AFPOSDEFS = afposdefs()
-#AUFSOSDEFS = aufsosdefs()
-
-ifdef([debug],[
- define([build_here],1)
-# location of atalk.local, etc.
- define([etcdest],concat(cwd,[[[/etc]]]))
-])
-
-ifdef([includef],[
-# location of include files
- define([includedir],[cwd])
- define([cflags],concat(cflags,[ -I],includedir))
-])
-
-ifdef([build_here],[
-# location of include files
- define([includedir],[cwd])
-# location of des subroutine source (see lib/afp/README)
- define([desloc],[[../../extras]])
-# location of user cap programs
- define([capdestdir],concat(cwd,[[[/bin]]]))
-# location of cap "server" programs (aufs, lwsrv, papif, uab etc.)
- define([capsrvrdestdir],concat(cwd,[[[/bin]]]))
-# location of some cap data files
- define([caplibdestdir],concat(cwd,[[[/bin]]]))
-# location of cap libraries
- define([libdestdir],concat(cwd,[[[/lib]]]))
-# cap library names
- define([caplib],[[libcap.a]])
- define([afplib],[[libafp.a]])
- define([afpclib],[[libafpc.a]])
-# names to load cap libraries with
- define([libcap],concat(cwd,[[[/lib/libcap.a]]]))
- define([libafp],concat(cwd,[[[/lib/libafp.a]]]))
- define([libafpc],concat(cwd,[[[/lib/libafpc.a]]]))
- define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))
- define([cflags],concat(cflags,[ -I],includedir))
- define([atalklocal],concat([\"],etcdest,[/],[atalk.local],[\"]))
- define([etalklocal],concat([\"],etcdest,[/],[etalk.local],[\"]))
- define([configdir],concat([\"],etcdest,[\"]))
-])
-
-define([datestring],maketemp(/tmp/capcXXXXXX))
-syscmd(date > datestring())
-##########MARKER##########
-# Makefile autoconfigured for ...
-[#] osname() system on include(datestring())
-syscmd(rm -f datestring())
-
-MFLAGS=mflags()
-LFLAGS=lflags()
-CC?=thecompiler()
-LD=theloader()
-SHELL=/bin/sh
-INSTALLER=theinstaller()
diff --git a/net/cap/files/patch-aa b/net/cap/files/patch-aa
deleted file mode 100644
index 99a13e3b9307..000000000000
--- a/net/cap/files/patch-aa
+++ /dev/null
@@ -1,92 +0,0 @@
---- Configure.orig Tue Jan 14 15:11:45 1997
-+++ Configure Tue Jan 14 15:52:29 1997
-@@ -433,7 +433,7 @@
- usingphase2="# define([usephase2],1)"
- usingatis="# define([useatis],1)"
- singletree="# define([debug],1)"
--includefile="# define([includef],1)"
-+includefile="define([includef],1)"
- result=0
- usephase2=0
- uabsupport=0
-@@ -1517,29 +1517,39 @@
- echo "# prevent itself from being included twice"
- echo "# define _TYPES"
- echo "${needselfdef}"
--${PCAT} <<\EOT1
-+${PCAT} <<\EOTL
- # MINOR CONFIGURATION: configure various programs
-
- #define([columbia],1) # so columbia can do things quickly
- #define([rutgersdef],1) # so rutgers can do things quickly
-
-+EOTL
-+echo "# Installation prefix"
-+if [ ! -z ${PREFIX} ]; then
-+ echo "define([prefix],[[${PREFIX}]])"
-+ else
-+ echo "define([prefix],[[/usr/local]])"
-+fi
-+echo
-+
-+${PCAT} <<\EOT1
- # location of include files
--define([includedir],[[/usr/include]])
-+define([includedest],concat(prefix,[[[/include]]]))
- ifelse(os,[epix],[define([includedir],[[/bsd43/usr/include]])])
- # location of des subroutine source (see lib/afp/README)
- define([desloc],[[../../extras]])
- # location of atalk.local, etc.
--define([etcdest],[[/etc]])
-+define([etcdest],concat(prefix,[/etc/cap]))
- ifdef([columbia],[define([etcdest],[[/usr/local/lib/cap]])])
- # location of user cap programs
--define([capdestdir],[[/usr/local/cap]])
-+define([capdestdir],concat(prefix,[/bin]))
- # location of cap "server" programs (aufs, lwsrv, papif, uab etc.)
--define([capsrvrdestdir],[[/usr/local/cap]])
-+define([capsrvrdestdir],concat(prefix,[/sbin]))
- # location of some cap data files
--define([caplibdestdir],[[/usr/local/lib/cap]])
-+define([caplibdestdir],concat(prefix,[/lib/cap]))
- ifdef([rutgersdef],[define([caplibdestdir],[[/usr/local/cap/lib]])])
- # location of cap libraries
--define([libdestdir],[[/usr/local/lib]])
-+define([libdestdir],concat(prefix,[/lib]))
- # override for aux (doesn't search /usr/local/lib)
- ifelse(os,[aux],[define([libdestdir],[[/usr/lib]])])
- # cap library names
-@@ -1587,11 +1597,11 @@
- ifelse(os,[netbsd],
- [define([libafpc],concat([-L],libdestdir,[ ],libafpc))])
- ifelse(os,[freebsd],
-- [define([libcap],concat([-L],libdestdir,[ ],libcap))])
-+ [define([libcap],concat([-L],cwd,[/lib/cap],[ ],libcap))])
- ifelse(os,[freebsd],
-- [define([libafp],concat([-L],libdestdir,[ ],libafp))])
-+ [define([libafp],concat([-L],cwd,[/lib/afp],[ ],libafp))])
- ifelse(os,[freebsd],
-- [define([libafpc],concat([-L],libdestdir,[ ],libafpc))])
-+ [define([libafpc],concat([-L],cwd,[/lib/afpc],[ ],libafpc))])
- # any special libraries
- define([libspecial],[])
- ifelse(os,[ultrix40],[
-@@ -1717,7 +1727,7 @@
- # for cap.printers - uncomment and change the following line to point
- # papif, et. al. to a location other than /etc/cap.printers. (Note:
- # line below would set it to $etcdest/cap.printers)
--# define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))
-+define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))
- ifdef([columbia],
- [define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))])
- # for atalkdbm - allows change following line(s) to modify atalk.local
-@@ -1850,7 +1860,8 @@
- define([afposdefs],
- concat( ifdef([X_FLOCK],[], ifelse(os,[aix],[],[ -DNOFLOCK])),
- ifdef([X_LOCKF],[],
-- [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL],[ -DNOLOCKF])])))
-+ [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL],[ -DNOLOCKF]),
-+ ifelse(os,[freebsd],[ -DUSEFCNTLLOCK],[ -DNOLOCKF]))])))
- # for aufs
- define([aufsosdefs],
- concat(aufsosdefs,
diff --git a/net/cap/files/patch-ab b/net/cap/files/patch-ab
deleted file mode 100644
index 24b0abaded73..000000000000
--- a/net/cap/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig Wed Nov 13 21:19:14 1996
-+++ Makefile Thu Nov 14 14:19:16 1996
-@@ -19,6 +19,12 @@
- (cd lib/afpc; make install)
- touch libinstall
-
-+dummy-libinstall: libsmade
-+ ranlib lib/cap/libcap.a
-+ ranlib lib/afp/libafp.a
-+ ranlib lib/afpc/libafpc.a
-+ touch libinstall
-+
- programs: libinstall
- -(cd etc; make)
- -(cd samples; make)
diff --git a/net/cap/files/patch-ac b/net/cap/files/patch-ac
deleted file mode 100644
index 299819508c3c..000000000000
--- a/net/cap/files/patch-ac
+++ /dev/null
@@ -1,52 +0,0 @@
---- netat/Makefile.m4.orig Thu Nov 14 14:23:47 1996
-+++ netat/Makefile.m4 Thu Nov 14 14:24:05 1996
-@@ -1,4 +1,4 @@
--I=includedir()
-+I=includedest()
- HFILES = aberrors.h abqueue.h appletalk.h afp.h afpcmd.h afpc.h \
- compat.h sysvcompat.h macfile.h abnbp.h fcntldomv.h afppass.h
-
---- etc/Makefile.m4.orig Sun Mar 8 22:46:19 1992
-+++ etc/Makefile.m4 Sun Jan 26 00:19:02 1997
-@@ -1,17 +1,20 @@
- CFLAGS=cflags() nbpflags() specialcflags()
- SDESTDIR=capsrvrdestdir()
- UDESTDIR=capdestdir()
--ETCDIR=etcdest()
- CAPLIB=libcap()
- I=includedir()
- # for other libraries (like BSD on hpux)
- SLIB=libspecial()
-
-+ETCDIR=/var/run
-+
- ifdef([useatis],[],[# ])ATISPROGS=atis
- PROGS=${ATISPROGS}
-
- # aufs.c definitions: USEVPRINTF - use vprintf in logging
- ifdef([usevprintf],[],[#])ATISDEFS=-DUSEVPRINTF
-+
-+ATISDEFS+=-DNISDUMPFILE=\"/var/tmp/nis.db\" -DATISRUNFILE=\"/var/tmp/atis.run\"
-
- # Make sure to define needgetopt if your system doesnt have it or
- # just set GETOPT=att_getopt.o (or to a getopt of your own liking)
---- support/uab/Makefile.m4.orig Sun Mar 8 22:46:21 1992
-+++ support/uab/Makefile.m4 Sun Jan 26 00:46:55 1997
-@@ -5,6 +5,8 @@
- CAPLIB=libcap()
- LFLAGS=
-
-+UABDEFS=-DUAB_RUNFILE=\"/var/tmp/uab.run\" -DUAB_STATSFILE=\"/var/tmp/uab.stats\" -DUAB_DUMPFILE=\"/var/tmp/uab.dump\"
-+
- SRCS=aarp.c kip_mpx.c rtmp.c ethertalk.c ddprouter.c ddpsvcs.c ddpport.c \
- hash.c asyncatalk.c
- OBJS=aarp.o kip_mpx.o rtmp.o ethertalk.o ddprouter.o ddpsvcs.o ddpport.o \
-@@ -28,7 +30,7 @@
- ${CC} -c ${CFLAGS} -DTAB=etalklocal() -DMTAB=etalklocal() kip_mpx.c
-
- uab.o: uab.c mpxddp.h gw.h node.h ddpport.h if_desc.h
-- ${CC} -c ${CFLAGS} -DUAB_PIDFILE=uabpidfile() \
-+ ${CC} -c ${CFLAGS} ${UABDEFS} -DUAB_PIDFILE=uabpidfile() \
- -DBRIDGE_DESC=uabbrdescr() uab.c
-
- lint:
diff --git a/net/cap/files/patch-ad b/net/cap/files/patch-ad
deleted file mode 100644
index 0073ed2a4f4e..000000000000
--- a/net/cap/files/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
---- support/ethertalk/bpfiltp.c.orig Tue Jan 14 11:15:34 1997
-+++ support/ethertalk/bpfiltp.c Tue Jan 14 13:18:36 1997
-@@ -41,6 +41,14 @@
- #include <net/if.h>
- #include <net/bpf.h>
- #include <netinet/in.h>
-+#ifdef __FreeBSD__
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#endif
-+#if __FreeBSD_version >= 300000
-+#include <net/if_var.h>
-+#endif
-+#endif /*__FreeBSD__*/
- #include <netinet/if_ether.h>
- #include <netdb.h>
- #include <ctype.h>
-@@ -785,7 +793,7 @@
-
- bcopy(eaddr, &eh.ether_dhost, 6);
- #ifdef PHASE2
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && __FreeBSD_version <= 199607
- /* This should really be fixed in the kernel. */
- eh.ether_type = buflen;
- #else
-@@ -806,7 +814,7 @@
- *q++ = (eph->protocol >> 8) & 0xff;
- *q++ = (eph->protocol & 0xff);
- #else PHASE2
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && __FreeBSD_version <= 199607
- /* This should really be fixed in the kernel. */
- eh.ether_type = eph->protocol;
- #else
diff --git a/net/cap/files/patch-ae b/net/cap/files/patch-ae
deleted file mode 100644
index e5a3215e132f..000000000000
--- a/net/cap/files/patch-ae
+++ /dev/null
@@ -1,189 +0,0 @@
-Patches to reflect file locations in man pages.
---- man/aarpd.8.orig Sun Mar 8 22:46:26 1992
-+++ man/aarpd.8 Sun Nov 10 08:01:47 1996
-@@ -32,7 +32,7 @@
- At startup,
- .I aarpd
- probes for a node number, determines the network number and
--maintains a copy of the network information in /etc/etalk.local which it
-+maintains a copy of the network information in /usr/local/etc/cap/etalk.local which it
- updates as necessary.
- .PP
- The options
-@@ -57,10 +57,10 @@
- .BI <interface> " <zoneName>"
- defines the network interface (as listed by netstat(8)) such as ie0, le0,
- ln0 or pf0. The zoneName argument is a valid zonename for the EtherTalk
--connected to the interface. These values may be seeded in /etc/etalk.local
-+connected to the interface. These values may be seeded in /usr/local/etc/cap/etalk.local
- but it is recommended that both arguments be supplied.
- .SH FILES
--/etc/etalk.local - refer man/etalk.local.5
-+/usr/local/etc/cap/etalk.local - refer man/etalk.local.5
- .SH NOTES
- .I aarpd
- be run as "root" (uid 0) and should be started before any other CAP
---- man/atalk.local.5.orig Wed Mar 13 19:47:13 1991
-+++ man/atalk.local.5 Sun Nov 10 08:05:49 1996
-@@ -129,7 +129,7 @@
- underlying IP network structure is of importance here. Unfortunately,
- the details of this issue are beyond the scope of this document.
- .SH FILES
--atalk.local usually resides in /etc
-+atalk.local resides in /usr/local/etc/cap
- .SH BUGS
- The node numbers should be automatically determined since they are
- fixed. In addition, it would be nice if the zone name were picked up
---- man/atis.8.orig Sun Jan 26 00:25:04 1997
-+++ man/atis.8 Sun Jan 26 00:32:44 1997
-@@ -91,19 +91,19 @@
- .I atis
- automatically disassociates itself from the controlling terminal
- unless debug options are set. To allow some control over the
--disassocated process, the pid is recorded in /etc/atis.pid and the
-+disassocated process, the pid is recorded in /usr/local/etc/cap/atis.pid and the
- following commands options have been added.
- .TP
- .B dump
- sends a SIGQUIT signal to the running atis. This causes the running
- atis to dump
--its name table into /usr/tmp/nis.db.
-+its name table into /var/tmp/nis.db.
- .TP
- .B reload
- sends a SIGHUP signal to the running atis. This
- causes the running
- .I atis
--to reload its name tables from /usr/tmp/nis.db.
-+to reload its name tables from /var/tmp/nis.db.
- .TP
- .B exit
- will stop the currently running copy of
-@@ -112,11 +112,11 @@
- .TP
- .B debug
- increments the debug level of the running server by sending it a
--SIGIOT. If no log file was defined, /usr/tmp/atis.run is created and used.
-+SIGIOT. If no log file was defined, /var/tmp/atis.run is created and used.
- .TP
- .B nodebug
- turns off debugging in the running server by sending it a SIGEMT. If
--/usr/tmp/atis.run was created by
-+/var/tmp/atis.run was created by
- .I debug
- then the file is closed.
- .PP
-@@ -131,14 +131,14 @@
- to dump the database and exit.
- .PP
- .SH FILES
--/etc/atis.pid records the pid of the currently running server.
-+/usr/local/etc/cap/atis.pid records the pid of the currently running server.
- .br
--/etc/atalk.local is used to find the closest Ethernet/Appletalk bridge
-+/usr/local/etc/cap/atalk.local is used to find the closest Ethernet/Appletalk bridge
- (directory location alterable at compile time).
- .br
--/usr/tmp/nis.db is used to hold the name data base when dumped
-+/var/tmp/nis.db is used to hold the name data base when dumped
- .br
--/usr/tmp/atis.run is used for logging if debug is turned on without a
-+/var/tmp/atis.run is used for logging if debug is turned on without a
- log file via "atis debug".
- .SH NOTES
- The current copy of atis runs with Revisions 10/86, 9/87, 1/88 or 6/88 of the
---- man/atprint.1.orig Sun Mar 8 22:44:36 1992
-+++ man/atprint.1 Sun Nov 10 08:23:43 1996
-@@ -49,7 +49,7 @@
- PostScript device.
- You can specify the device in one of three ways (-a is the default).
- "tlw -u <short-printer-name>" maps a Unix short printer name to an Appletalk
--entity name via the cap.printers file (often found in /etc).
-+entity name via the cap.printers file (found in /usr/local/etc/cap).
- "tlw -a <object-name>" specifies a device of type "LaserWriter" in the current
- zone "*".
- "tlw -a <appletalk-entity>" lets you choose an arbitrary object, type and zone,
-@@ -96,7 +96,7 @@
- .SH BUGS
- There are bound to be several.
- .SH FILES
--/etc/cap.printers \- papif configuation file to associate UNIX printer
-+/usr/local/etc/cap/cap.printers \- papif configuration file to associate UNIX printer
- queues with LaserWriter names. Location may vary according to local option.
- .SH AUTHOR
- lwpr, iwpr, tlw and isrv were written by Charlie C. Kim of
---- man/etalk.local.5.orig Thu Mar 14 23:50:17 1991
-+++ man/etalk.local.5 Sun Nov 10 08:04:48 1996
-@@ -42,6 +42,6 @@
- An underscore in the zone name is
- no longer treated as a space as in previous versions of atalk.local.
- .SH FILES
--etalk.local usually resides in /etc
-+etalk.local resides in /usr/local/etc/cap
- .SH SEE ALSO
- CAP(3), CAP(8), atalkatab(5), atalkad(8), atis(8)
---- man/lwrename.8.orig Sun Nov 10 08:37:05 1996
-+++ man/lwrename.8 Sun Nov 10 08:40:05 1996
-@@ -141,7 +141,7 @@
- .I start\-cap\-servers
- file.
- .SH FILES
--/etc/lwrename.list default location for list of monitored printers
-+/usr/local/lib/cap/lwrename.list location for list of monitored printers
- .SH SEE ALSO
- CAP(8), atlook(1), lwsrv(8)
- .SH AUTHOR
---- man/papif.8.orig Sun Nov 10 08:16:47 1996
-+++ man/papif.8 Sun Nov 10 08:26:38 1996
-@@ -414,9 +414,9 @@
- may no longer work properly.
- .SH FILES
- .nf
--.ta \w'/etc/cap.printers 'u
-+.ta \w'/usr/local/etc/cap/cap.printers 'u
- /etc/printcap
--/etc/cap.printers (location is settable)
-+/usr/local/etc/cap/cap.printers (location is settable)
- \&.status lpd status file
- newstatus papif status temporary file
- \&.banner lpd banner file
---- man/snitch.1.orig Thu Feb 28 21:42:51 1991
-+++ man/snitch.1 Sun Nov 10 08:41:46 1996
-@@ -103,7 +103,7 @@
- .I snitch
- in the background).
- .SH FILES
--Uses the cap file "atalk.local", usually in /etc.
-+Uses the cap file "atalk.local", in //usr/local/etc/cap.
- .SH "SEE ALSO"
- CAP(8), atis(8), cap(3)
- .SH EXAMPLE
---- man/UAB.8.orig Sun Mar 8 22:43:56 1992
-+++ man/UAB.8 Sun Jan 26 00:53:02 1997
-@@ -73,12 +73,12 @@
- (SIGEMT), statistics (SIGUSR2), or exit (SIGTERM) will
- send these signals.
- tdump causes the running uab to dump its internal tables (rtmp, etc.) to
--/usr/tmp/uab.dump. (dump is
-+/var/tmp/uab.dump. (dump is
- reserved for nbp if uab ever support nbp). debug tells the running
- uab to increment the debug level: if not log file was currently
--active, the log will go to /usr/tmp/uab.run.
-+active, the log will go to /var/tmp/uab.run.
- nodebug turns off all debugging.
--stat or statisitics dumps statistics to /usr/tmp/uab.stats. exit
-+stat or statisitics dumps statistics to /var/tmp/uab.stats. exit
- causes the running uab to stop.
- .PP
- The bridge description file is a list of the valid ports for a
-@@ -155,7 +155,7 @@
- for Computing Activities, Columbia University
- .SH FILES
- .nf
--/usr/tmp/uab.stats
--/usr/tmp/uab.run
--/usr/tmp/uab.dump
-+/var/tmp/uab.stats
-+/var/tmp/uab.run
-+/var/tmp/uab.dump
- .fi
diff --git a/net/cap/files/patch-af b/net/cap/files/patch-af
deleted file mode 100644
index 3b7d69762816..000000000000
--- a/net/cap/files/patch-af
+++ /dev/null
@@ -1,73 +0,0 @@
---- etc/list-cap-servers.orig Mon Nov 25 13:11:46 1996
-+++ etc/list-cap-servers Mon Nov 25 13:22:07 1996
-@@ -1,2 +1,2 @@
- #! /bin/sh
--ps agx | egrep ':[0-9][0-9]( | [^ ]*/)(atalkrd|atis|aufs|lwsrv|lwrename|printqueue)( |$)'
-+ps ax | egrep '[0-9][0-9]( | [^ ]*/)(atalkrd|atis|aufs|lwsrv|lwrename|printqueue|snitch|aarpd)( |$)'
---- etc/start-cap-servers.orig Tue Nov 26 02:38:32 1996
-+++ etc/start-cap-servers Tue Nov 26 02:49:03 1996
-@@ -1,11 +1,12 @@
- #!/bin/sh
-
--### sample start servers file (copy to /usr/local/lib)
--### start from '/etc/rc.local'
-+### sample start servers file (copy to /usr/local/etc/rc.d
-+### as start-cap-servers.sh or something. And /etc/rc will automatically
-+### execute this script.)
-
--LOGd=/usr/tmp
-+LOGd=/var/log
- LOGf=/dev/null
--CAP=/usr/local/cap
-+CAP=/usr/local/sbin
- LIB=/usr/local/lib/cap
-
- LWARGS="-a ${LIB}/procsets -f ${LIB}/LW+Fonts"
-@@ -19,7 +20,7 @@
- #
- # Otherwise start aarpd first for Native EtherTalk
- #
--# ${CAP}/aarpd "interface" "zone"
-+${CAP}/aarpd "interface" "zone"
-
- #
- # Or capd for Kernel AppleTalk under Linux
-@@ -34,12 +35,12 @@
- #
- # Make this 15 seconds if using aarpd
- #
--sleep 5
-+sleep 15
-
--${CAP}/snitch -S -f "SUN 4 SunOS 4.0 UNIX" -l lwsrv
-+${CAP}/snitch -S -f "`uname -s -r` UNIX" -l lwsrv
- ${CAP}/lwsrv -n "Technical Services Spool" -p lw.tsa ${LWARGS}
-
- # if CAP compiled with FIXED_DIRIDS then start AFP ID server first
- # ${CAP}/afpidsrvr -l ${LOGd}/afpidsrvr.log
-
--${CAP}/aufs -U 20 -V ${LIB}/afpvols -l ${LOGf} -n `hostname`
-+${CAP}/aufs -U 20 -V ${LIB}/afpvols -F ${LIB}/afpfile -l ${LOGf} -n `hostname`
---- etc/kill-cap-servers.orig Mon Nov 25 16:16:13 1996
-+++ etc/kill-cap-servers Mon Nov 25 16:21:11 1996
-@@ -1,17 +1,17 @@
- #! /bin/sh
- TEMP=/tmp/kcs$$
- trap "rm -f $TEMP" 1 2 3 15
--ps agx | egrep ':[0-9][0-9]( | [^ ]*/)(atalkrd|atis|aufs|lwsrv|lwrename|printqueue)( |$)' > $TEMP
-+ps ax | egrep '[0-9][0-9]( | [^ ]*/)(atalkrd|atis|aufs|lwsrv|lwrename|printqueue|snitch|aarpd)( |$)' > $TEMP
- cat $TEMP
- echo -n 'Kill [ny]? '
- read reply junk
- if [ X${reply-n} = Xy ] ; then
- echo Killing...
-- AUFS=`egrep ':[0-9][0-9]( | [^ ]*/)aufs( |$)' $TEMP | awk '{print $1}'`
-+ AUFS=`egrep '[0-9][0-9]( | [^ ]*/)aufs( |$)' $TEMP | awk '{print $1}'`
- if [ x"$AUFS" != x ]; then
- kill -HUP $AUFS
- fi
-- kill `egrep -v ':[0-9][0-9]( | [^ ]*/)aufs( |$)' $TEMP | awk '{print $1}'`
-+ kill `egrep -v '[0-9][0-9]( | [^ ]*/)aufs( |$)' $TEMP | awk '{print $1}'`
- else
- echo Cancelled...
- fi
diff --git a/net/cap/files/patch-ag b/net/cap/files/patch-ag
deleted file mode 100644
index 6ec14d00410a..000000000000
--- a/net/cap/files/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
---- support/ethertalk/aarpd.c.orig Mon Dec 30 01:29:16 1996
-+++ support/ethertalk/aarpd.c Mon Dec 30 01:29:59 1996
-@@ -19,6 +19,7 @@
- #if !defined(ultrix) && !defined(__osf__) && !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(__bsdi__) && !defined(NeXT)
- #include <sys/sockio.h>
- #endif /* ultrix && __osf__ && __386BSD__ && __FreeBSD__ */
-+#include <sys/time.h>
- #include <net/if.h>
- #endif PHASE2
- #include <netinet/in.h>
diff --git a/net/cap/files/patch-ah b/net/cap/files/patch-ah
deleted file mode 100644
index af5ed3fc243d..000000000000
--- a/net/cap/files/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
---- support/uab/aarp.c.orig Tue Jan 14 11:11:30 1997
-+++ support/uab/aarp.c Tue Jan 14 13:31:06 1997
-@@ -40,6 +40,14 @@
- #ifdef pyr
- #include <netinet/in_ether.h>
- #else pyr
-+#ifdef __FreeBSD__
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#endif
-+#if __FreeBSD_version >= 300000
-+#include <net/if_var.h>
-+#endif
-+#endif /*__FreeBSD__*/
- #include <netinet/if_ether.h>
- #endif pyr
-
diff --git a/net/cap/files/patch-ai b/net/cap/files/patch-ai
deleted file mode 100644
index 3cf7b2216e51..000000000000
--- a/net/cap/files/patch-ai
+++ /dev/null
@@ -1,29 +0,0 @@
---- support/ethertalk/bpfiltp.c.orig Mon Feb 1 10:09:12 1999
-+++ support/ethertalk/bpfiltp.c Mon Feb 1 10:07:12 1999
-@@ -47,6 +47,8 @@
- #endif
- #if __FreeBSD_version >= 300000
- #include <net/if_var.h>
-+#include <net/if_dl.h>
-+#include <net/ethernet.h>
- #endif
- #endif /*__FreeBSD__*/
- #include <netinet/if_ether.h>
-@@ -347,9 +349,17 @@
- struct ifreq *ifr;
- {
- int sock;
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 300000
-+ struct sockaddr_dl *sdl;
-
-+ sdl = (struct sockaddr_dl *)&ifr->ifr_addr;
-+ sdl->sdl_len = sizeof(struct sockaddr_dl);
-+ sdl->sdl_family = AF_LINK;
-+ bcopy(multi, LLADDR(sdl), ETHER_ADDR_LEN);
-+#else
- ifr->ifr_addr.sa_family = AF_UNSPEC;
- bcopy(multi, ifr->ifr_addr.sa_data, EHRD);
-+#endif
- /*
- * open a socket, temporarily, to use for SIOC* ioctls
- *
diff --git a/net/cap/files/patch-applications-aufs-afpos.c b/net/cap/files/patch-applications-aufs-afpos.c
deleted file mode 100644
index 7d5e440dd368..000000000000
--- a/net/cap/files/patch-applications-aufs-afpos.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- applications/aufs/afpos.c.orig Wed Feb 5 17:48:07 2003
-+++ applications/aufs/afpos.c Wed Feb 5 17:48:45 2003
-@@ -4776,7 +4776,7 @@
- #if !(defined(__FreeBSD__) || defined(__NetBSD__))
- extern char *sys_errlist[];
- #endif
-- extern int sys_nerr;
-+ extern __const int sys_nerr;
- static char buf[50];
- int serrno;
-
diff --git a/net/cap/files/patch-applications-lwsrv-lwsrv.c b/net/cap/files/patch-applications-lwsrv-lwsrv.c
deleted file mode 100644
index 86ef32146da6..000000000000
--- a/net/cap/files/patch-applications-lwsrv-lwsrv.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- applications/lwsrv/lwsrv.c.orig Sat Mar 20 14:38:45 2004
-+++ applications/lwsrv/lwsrv.c Sat Mar 20 14:55:51 2004
-@@ -1864,7 +1864,7 @@
- PFILE *pf;
- {
- long t;
-- int argc, i;
-+ int argc, i, fd;
- FILE *outfile;
- char tname[256],status[256];
- char pbuf[256],rhbuf[16],jbuf[1024];
-@@ -1930,10 +1930,8 @@
- strcat(tname,"/lwsrvXXXXXX");
- } else
- strcpy(tname,TEMPFILE);
-- mktemp(tname);
-- if ((outfile = fopen(tname, "w+")) == NULL)
-+ if ( ((fd = mkstemp(tname)) == -1 ) || ((outfile = fdopen(fd, "w+")) == NULL) )
- perror(tname);
-- chmod(tname, 0600);
- }
-
- NewStatus(prtp->children <= 0 ? "initializing" : statusprocessing);
-@@ -2310,7 +2308,7 @@
- PFILE *pf;
- {
- long t;
-- int argc, i;
-+ int argc, i, fd;
- FILE *outfile;
- char tname[256],status[256];
- char pbuf[256],rhbuf[16],jbuf[1024];
-@@ -2354,16 +2352,15 @@
- if (tmpfiledir != NULL) {
- strcpy(tname,tmpfiledir);
- strcat(tname,"/lwsrvXXXXXX");
-+ if ((outfile = fopen(tname, "w+")) == NULL)
-+ perror(tname);
-+ chmod(tname, 0600);
- } else
- strcat(tname,TEMPFILE);
-- mktemp(tname);
-+ if ( ((fd = mkstemp(tname)) == -1 ) || ((outfile = fdopen(fd, "w+")) == NULL) )
-+ perror(tname);
- }
-
-- if ((outfile = fopen(tname, "w+")) == NULL)
-- perror(tname);
--
-- chmod(tname, 0600);
--
- if (singlefork)
- NewStatus("initializing");
-
diff --git a/net/cap/files/patch-applications-lwsrv-simple.c b/net/cap/files/patch-applications-lwsrv-simple.c
deleted file mode 100644
index 7483887dd229..000000000000
--- a/net/cap/files/patch-applications-lwsrv-simple.c
+++ /dev/null
@@ -1,98 +0,0 @@
---- applications/lwsrv/simple.c.orig Sat Mar 20 12:03:13 2004
-+++ applications/lwsrv/simple.c Sat Mar 20 12:06:30 2004
-@@ -139,8 +139,7 @@
- byte changeecho;
- #endif /* LWSRV8 */
- } toktbl[] = {
--#ifndef LWSRV8
- #define TOKEN(token, tag) { (token), (sizeof(token)-1), (tag)}
- TOKEN("%%EOF", TOK_DROP),
- TOKEN("%%Title", TOK_TIT),
- TOKEN("%%Creator", TOK_CRE),
-@@ -161,84 +159,24 @@
- TOKEN("%%BeginProcSet", TOK_BPS),
- TOKEN("%%EndProcSet", TOK_EPS),
- TOKEN("%%?BeginPrinterQuery", TOK_BEGINR),
- TOKEN("%%?EndPrinterQuery", TOK_ENDR),
- TOKEN("%%?BeginQuery", TOK_BEGINR),
- TOKEN("%%?EndQuery", TOK_ENDR),
--#else /* LWSRV8 */
--/* Now in SORTED order, because we do a binary search on it */
--#define TOKEN(token, tag, e) {(token), (tag), (sizeof(token)-1), (e)}
-- TOKEN("%!PS-Adobe-", TOK_PSA, ECHO_OFF),
-- TOKEN("%%?BeginFeatureQuery", TOK_BFEQ, ECHO_UNCHANGED),
-- TOKEN("%%?BeginFileQuery", TOK_BFIQ, ECHO_UNCHANGED),
-- TOKEN("%%?BeginFontListQuery", TOK_BFLQ, ECHO_UNCHANGED),
-- TOKEN("%%?BeginFontQuery", TOK_BFOQ, ECHO_UNCHANGED),
-- TOKEN("%%?BeginPrinterQuery", TOK_BPRQ, ECHO_UNCHANGED),
-- TOKEN("%%?BeginProcSetQuery", TOK_BPSQ, ECHO_UNCHANGED),
-- TOKEN("%%?BeginQuery", TOK_BQU, ECHO_UNCHANGED),
-- TOKEN("%%?BeginResourceListQuery", TOK_BRLQ, ECHO_UNCHANGED),
-- TOKEN("%%?BeginResourceQuery", TOK_BREQ, ECHO_UNCHANGED),
-- TOKEN("%%?BeginVMStatus", TOK_BVQ, ECHO_UNCHANGED),
-- TOKEN("%%?EndFeatureQuery", TOK_EFEQ, ECHO_UNCHANGED),
-- TOKEN("%%?EndFileQuery", TOK_EFIQ, ECHO_UNCHANGED),
-- TOKEN("%%?EndFontListQuery", TOK_EFLQ, ECHO_UNCHANGED),
-- TOKEN("%%?EndFontQuery", TOK_EFOQ, ECHO_UNCHANGED),
-- TOKEN("%%?EndPrinterQuery", TOK_EPRQ, ECHO_UNCHANGED),
-- TOKEN("%%?EndProcSetQuery", TOK_EPSQ, ECHO_UNCHANGED),
-- TOKEN("%%?EndQuery", TOK_EQU, ECHO_UNCHANGED),
-- TOKEN("%%?EndResourceListQuery", TOK_ERLQ, ECHO_UNCHANGED),
-- TOKEN("%%?EndResourceQuery", TOK_EREQ, ECHO_UNCHANGED),
-- TOKEN("%%?EndVMStatus", TOK_EVQ, ECHO_UNCHANGED),
-- TOKEN("%%BeginExitServer", TOK_BEGIN, ECHO_OFF),
-- TOKEN("%%BeginProcSet", TOK_BPS, ECHO_OFF),
-- TOKEN("%%Creator", TOK_CRE, ECHO_UNCHANGED),
-- TOKEN("%%EOF", TOK_TEOF, ECHO_DROP),
-- TOKEN("%%EndComments", TOK_ENC, ECHO_UNCHANGED),
-- TOKEN("%%EndExitServer", TOK_END, ECHO_ON),
-- TOKEN("%%EndProcSet", TOK_EPS, ECHO_ON),
-- TOKEN("%%For", TOK_FOR, ECHO_UNCHANGED),
--#endif /* LWSRV8 */
- #ifdef ADOBE_DSC2_CONFORMANT
--#ifndef LWSRV8
- TOKEN("%%IncludeProcSet", TOK_IPS),
--#else /* LWSRV8 */
-- TOKEN("%%IncludeProcSet", TOK_IPS, ECHO_UNCHANGED),
--#endif /* LWSRV8 */
- #else ADOBE_DSC2_CONFORMANT
--#ifndef LWSRV8
- TOKEN("%%IncludeProcSet", TOK_IPS|TOK_INVALID),
--#else /* LWSRV8 */
-- TOKEN("%%IncludeProcSet", TOK_IPS|TOK_INVALID, ECHO_UNCHANGED),
--#endif /* LWSRV8 */
- #endif ADOBE_DSC2_CONFORMANT
--#ifndef LWSRV8
- #ifdef PAGECOUNT
- TOKEN("%%Pages", TOK_PGS),
- #endif PAGECOUNT
--#else /* LWSRV8 */
-- TOKEN("%%Page:", TOK_PAGE, ECHO_UNCHANGED),
-- TOKEN("%%Pages", TOK_PGS, ECHO_UNCHANGED),
--#endif /* LWSRV8 */
- #ifdef PROCSET_PATCH
--#ifndef LWSRV8
- TOKEN("%%Patches", TOK_PATCH),
--#else /* LWSRV8 */
-- TOKEN("%%Patches", TOK_PATCH, ECHO_OFF),
--#endif /* LWSRV8 */
- #endif PROCSET_PATCH
--#ifdef LWSRV8
-- TOKEN("%%Title", TOK_TIT, ECHO_UNCHANGED),
--#endif /* LWSRV8 */
-- /* very old type of queries */
--#ifndef LWSRV8
- TOKEN("%?appledict version #", TOK_ADV),
-- TOKEN("%?fontList", TOK_FLS),
- TOKEN("%?end",TOK_ENDOLD),
-- {NULL, TOK_UNK, 0}
--#else /* LWSRV8 */
-- TOKEN("%?appledict version #", TOK_ADV, ECHO_OFF),
-- TOKEN("%?end",TOK_ENDOLD, ECHO_ON),
-- TOKEN("%?fontList", TOK_FLS, ECHO_OFF),
--#endif /* LWSRV8 */
-+ TOKEN("%?fontList", TOK_FLS),
-+ {NULL, TOK_UNK, 0}
- };
-
- #ifndef LWSRV8
diff --git a/net/cap/files/patch-applications-papif-papif.c b/net/cap/files/patch-applications-papif-papif.c
deleted file mode 100644
index ba4a6a2d14d1..000000000000
--- a/net/cap/files/patch-applications-papif-papif.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- applications/papif/papif.c.orig Sat Mar 20 12:14:20 2004
-+++ applications/papif/papif.c Sat Mar 20 12:19:52 2004
-@@ -1801,16 +1801,13 @@
- dolog(fmt, a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af)
- char *fmt;
- #else
--dolog(va_alist)
-+dolog(register char *fmt, ...)
--va_dcl
- #endif
- {
- #ifdef USEVPRINTF
-- register char *fmt;
- va_list args;
-
-- va_start(args);
-- fmt = va_arg(args, char *);
-+ va_start(args, fmt);
- if (jobout)
- vfprintf(jobout, fmt, args);
- vfprintf(stderr, fmt, args);
diff --git a/net/cap/files/patch-contrib-MacPS-macps-22.shar b/net/cap/files/patch-contrib-MacPS-macps-22.shar
deleted file mode 100644
index 2b0e0a5833e6..000000000000
--- a/net/cap/files/patch-contrib-MacPS-macps-22.shar
+++ /dev/null
@@ -1,26 +0,0 @@
---- contrib/MacPS/macps-22.shar.orig Thu Feb 28 13:45:16 1991
-+++ contrib/MacPS/macps-22.shar Sat Mar 20 14:56:30 2004
-@@ -738,7 +738,7 @@
- {
- register STR *str;
- register FILE *tp;
-- register int i;
-+ register int i, tmpfd;
- register unsigned char *lp;
- char buf[BUFSIZ];
- char *malloc(), *realloc();
-@@ -787,11 +787,10 @@
- fprintf(stderr, "%s: Can't open %s\n", myname, *argv);
- exit(1);
- }
-- mktemp(tempname);
-- if((tp = fopen(tempname, "w+")) == NULL) {
-+ if ( ((tmpfd = mkstemp(tempname)) == -1 ) || (tp = fdopen(tmpfd, "w+")) ) == NULL) {
- fprintf(stderr, "%s: Can't create temp file %s\n",
-- myname, tempname);
-- exit(1);
-+ myname, tempname);
-+ exit(1);
- }
- unlink(tempname);
- str = STRalloc();
diff --git a/net/cap/files/patch-contrib-MacPS-prepfix.c b/net/cap/files/patch-contrib-MacPS-prepfix.c
deleted file mode 100644
index 3f838d9b1732..000000000000
--- a/net/cap/files/patch-contrib-MacPS-prepfix.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- contrib/MacPS/prepfix.c.orig Thu Feb 28 13:45:17 1991
-+++ contrib/MacPS/prepfix.c Sat Mar 20 14:56:52 2004
-@@ -60,7 +60,7 @@
- {
- register STR *str;
- register FILE *tp;
-- register int i;
-+ register int i, tmpfd;
- register unsigned char *lp;
- char buf[BUFSIZ];
- char *malloc(), *realloc();
-@@ -109,8 +109,7 @@
- fprintf(stderr, "%s: Can't open %s\n", myname, *argv);
- exit(1);
- }
-- mktemp(tempname);
-- if((tp = fopen(tempname, "w+")) == NULL) {
-+ if ( ((tmpfd = mkstemp(tempname)) == -1 ) || (tp = fdopen(tmpfd, "w+")) ) == NULL) {
- fprintf(stderr, "%s: Can't create temp file %s\n",
- myname, tempname);
- exit(1);
diff --git a/net/cap/files/patch-lib-cap-ablog.c b/net/cap/files/patch-lib-cap-ablog.c
deleted file mode 100644
index c3baa70fe94a..000000000000
--- a/net/cap/files/patch-lib-cap-ablog.c
+++ /dev/null
@@ -1,66 +0,0 @@
---- lib/cap/ablog.c.orig Sat Aug 30 18:19:18 2003
-+++ lib/cap/ablog.c Sat Aug 30 18:25:05 2003
-@@ -24,13 +24,14 @@
- *
- */
-
-+#include <osreldate.h>
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <netat/appletalk.h>
-
- #ifdef USEVPRINTF
--# include <varargs.h>
-+# include <stdarg.h>
- #endif USEVPRINTF
- #ifdef USETIMES
- # include <time.h>
-@@ -66,8 +67,13 @@
- * This is something all machine should, but don't have :-)
- */
-
-+#if defined(__FreeBSD__) && __FreeBSD_version < 470000
- static FILE *lfp = stderr;
--
-+#else
-+static FILE *lfp;
-+static void lfp_construct (void) __attribute__((constructor));
-+static void lfp_construct (void) { lfp = stderr; }
-+#endif
-
- #ifndef USEVPRINTF
- /* Bletch - gotta do it because pyramids don't work the other way */
-@@ -79,19 +85,16 @@
- char *fmt;
- #else USEVPRINTF
- /*VARARGS*/
--logit(va_alist)
--va_dcl
-+logit(int level, char *fmt, ...)
- #endif USEVPRINTF
- {
- static char *mytod();
- #ifdef USEVPRINTF
-- register char *fmt;
- va_list args;
-- int level;
- #endif USEVPRINTF
- int saveerr;
- extern int errno;
-- extern int sys_nerr;
-+ extern __const int sys_nerr;
- #ifndef __FreeBSD__
- extern char *sys_errlist[];
- #endif
-@@ -101,9 +104,7 @@
-
- saveerr = errno;
- #ifdef USEVPRINTF
-- va_start(args);
-- level = va_arg(args, int);
-- fmt = va_arg(args, char *);
-+ va_start(args, fmt);
- #endif USEVPRINTF
-
- if (dlevel < (level & L_LVL))
diff --git a/net/cap/files/patch-papif.c b/net/cap/files/patch-papif.c
deleted file mode 100644
index 25f47e001577..000000000000
--- a/net/cap/files/patch-papif.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- applications/papif/papif.c.orig Sat Aug 21 18:29:42 2004
-+++ applications/papif/papif.c Sat Aug 21 18:31:17 2004
-@@ -244,6 +244,17 @@
- #define lpd_REPRINT 1 /* forces a reprint */
- #define lpd_ERRORS 2 /* printed with errors */
-
-+#ifndef USEVPRINTF
-+/* Bletch - gotta do it because pyramids don't work the other way */
-+/* (using _doprnt and &args) and don't have vprintf */
-+/* of course, there will be something that is just one arg larger :-) */
-+/* VARARGS1 */
-+dolog(fmt, a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af);
-+char *fmt;
-+#else
-+dolog(register char *fmt, ...);
-+#endif
-+
- #ifdef USESYSLOG
- #ifdef __STDC__
- log_i(fmt, a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af)
diff --git a/net/cap/files/patch-support-ethertalk-aarpd_clnt.c b/net/cap/files/patch-support-ethertalk-aarpd_clnt.c
deleted file mode 100644
index 9f4bf1a2e64c..000000000000
--- a/net/cap/files/patch-support-ethertalk-aarpd_clnt.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- support/ethertalk/aarpd_clnt.c.orig Sat Mar 20 12:58:10 2004
-+++ support/ethertalk/aarpd_clnt.c Sat Mar 20 13:12:03 2004
-@@ -32,8 +32,8 @@
- {
- static etheraddr res;
- bzero((char *)res, sizeof(res));
-- if (clnt_call(clnt, AARP_RESOLVE, xdr_int, (caddr_t)argp,
-- xdr_etheraddr, (char *)res, TIMEOUT) != RPC_SUCCESS) {
-+ if (clnt_call(clnt, AARP_RESOLVE, (xdrproc_t)xdr_int, (caddr_t)argp,
-+ (xdrproc_t)xdr_etheraddr, (char *)res, TIMEOUT) != RPC_SUCCESS) {
- return (NULL);
- }
- return (res);
-@@ -50,8 +50,8 @@
- {
- static bridgeaddr res;
- bzero((char *)res, sizeof(res));
-- if (clnt_call(clnt, RTMP_GETBADDR, xdr_int, (caddr_t)argp,
-- xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) {
-+ if (clnt_call(clnt, RTMP_GETBADDR, (xdrproc_t)xdr_int, (caddr_t)argp,
-+ (xdrproc_t)xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) {
- return (NULL);
- }
- return (res);
-@@ -68,8 +68,8 @@
- {
- static bridgeaddr res;
- bzero((char *)res, sizeof(res));
-- if (clnt_call(clnt, RTMP_SETBADDR, xdr_int, (caddr_t)argp,
-- xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) {
-+ if (clnt_call(clnt, RTMP_SETBADDR, (xdrproc_t)xdr_int, (caddr_t)argp,
-+ (xdrproc_t)xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) {
- return (NULL);
- }
- return (res);
-@@ -87,8 +87,8 @@
- {
- static bridgeaddr res; /* convenient size */
- bzero((char *)res, sizeof(res));
-- if (clnt_call(clnt, NET_RANGE_SET, xdr_int, (caddr_t)argp,
-- xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) {
-+ if (clnt_call(clnt, NET_RANGE_SET, (xdrproc_t)xdr_int, (caddr_t)argp,
-+ (xdrproc_t)xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) {
- return (NULL);
- }
- return (res);
diff --git a/net/cap/files/patch-support-ethertalk-aarpd_svc.c b/net/cap/files/patch-support-ethertalk-aarpd_svc.c
deleted file mode 100644
index 0760124306e7..000000000000
--- a/net/cap/files/patch-support-ethertalk-aarpd_svc.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- support/ethertalk/aarpd_svc.c.orig Sat Mar 20 13:48:32 2004
-+++ support/ethertalk/aarpd_svc.c Sat Mar 20 13:53:53 2004
-@@ -40,7 +40,7 @@
-
- switch (rqstp->rq_proc) {
- case NULLPROC:
-- (void)svc_sendreply(transp, xdr_void, (char *)NULL);
-+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
- return;
-
- case AARP_RESOLVE:
-@@ -74,16 +74,16 @@
- return;
- }
- bzero((char *)&argument, sizeof(argument));
-- if (!svc_getargs(transp, xdr_argument, (caddr_t)&argument)) {
-+ if (!svc_getargs(transp, (xdrproc_t)xdr_argument, (caddr_t)&argument)) {
- svcerr_decode(transp);
- return;
- }
- result = (*local)(&argument, rqstp);
- if (result != NULL
-- && !svc_sendreply(transp, xdr_result, (caddr_t)result)) {
-+ && !svc_sendreply(transp, (xdrproc_t)xdr_result, (caddr_t)result)) {
- svcerr_systemerr(transp);
- }
-- if (!svc_freeargs(transp, xdr_argument, (caddr_t)&argument)) {
-+ if (!svc_freeargs(transp, (xdrproc_t)xdr_argument, (caddr_t)&argument)) {
- (void)fprintf(stderr, "unable to free arguments\n");
- exit(1);
- }
diff --git a/net/cap/files/patch-support-ethertalk-aarpd_xdr.c b/net/cap/files/patch-support-ethertalk-aarpd_xdr.c
deleted file mode 100644
index 9ff2a29eac33..000000000000
--- a/net/cap/files/patch-support-ethertalk-aarpd_xdr.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- support/ethertalk/aarpd_xdr.c.orig Sat Mar 20 13:39:44 2004
-+++ support/ethertalk/aarpd_xdr.c Sat Mar 20 13:40:02 2004
-@@ -11,7 +11,7 @@
- XDR *xdrs;
- etheraddr objp;
- {
-- if (!xdr_vector(xdrs, (char *)objp, 6, sizeof(u_char), xdr_u_char)) {
-+ if (!xdr_vector(xdrs, (char *)objp, 6, sizeof(u_char), (xdrproc_t)xdr_u_char)) {
- return (FALSE);
- }
- return (TRUE);
-@@ -22,7 +22,7 @@
- XDR *xdrs;
- bridgeaddr objp;
- {
-- if (!xdr_vector(xdrs, (char *)objp, 4, sizeof(u_char), xdr_u_char)) {
-+ if (!xdr_vector(xdrs, (char *)objp, 4, sizeof(u_char), (xdrproc_t)xdr_u_char)) {
- return (FALSE);
- }
- return (TRUE);
diff --git a/net/cap/files/pkg-message.in b/net/cap/files/pkg-message.in
deleted file mode 100644
index 1a3bf1e51625..000000000000
--- a/net/cap/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
-**********************************************************************
- Now, edit %%PREFIX%%/etc/cap/start-cap-servers.sample.
- Then install it as %%PREFIX%%/etc/rc.d/start-cap-servers.sh.
-**********************************************************************
diff --git a/net/cap/pkg-descr b/net/cap/pkg-descr
deleted file mode 100644
index ce717da77bde..000000000000
--- a/net/cap/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-CAP - The Columbia AppleTalk Package for UNIX
-
-CAP implements the AppleTalk protocol stack on a variety of UNIX
-machines. The main applications provide an AppleShare 2.0 compatible
-server (aufs), a LaserWriter Spooler (lwsrv) and a program to print to
-LaserWriters (papif). The latter can be used to talk to EtherTalk
-LaserWriters, LocalTalk LaserWriters used on Dayna EtherPrint cards or
-on a LocalTalk/EtherTalk gateway. There are also a number of
-contributed packages bundled with CAP.
-
-Note: Files are installed into following locations:
- /usr/local/sbin: Commands for system manager.
- aarpd afpidlist afpidsrvr afpidtool atis aufs aufsmkkey
- aufsmkusr lwrename lwsrv lwsrv8 lwsrvconfig papif papof
- printqueue sizeserver snitch
- /usr/local/bin: User commands.
- ash atistest atlook atlooklws atpinger cvt2apple cvt2cap
- getzones instappl isrv iwpr lwpr papstatus tlw
- /usr/local/etc/cap: Sample configuration files.
- /usr/local/lib/cap: More sample configuration files.
- /usr/local/share/doc/cap: Relevant documentation.
-
-WWW: http://www.cs.mu.oz.au/appletalk/cap.html
diff --git a/net/cap/pkg-plist b/net/cap/pkg-plist
deleted file mode 100644
index e70c6189afa1..000000000000
--- a/net/cap/pkg-plist
+++ /dev/null
@@ -1,87 +0,0 @@
-sbin/atis
-bin/lwpr
-bin/tlw
-bin/atlook
-bin/atlooklws
-bin/atpinger
-bin/iwpr
-bin/isrv
-bin/ash
-bin/instappl
-bin/getzones
-bin/papstatus
-bin/atistest
-bin/cvt2apple
-bin/cvt2cap
-sbin/lwrename
-sbin/printqueue
-sbin/snitch
-sbin/aufsmkusr
-sbin/aufsmkkey
-sbin/lwsrv
-sbin/lwsrv8
-sbin/lwsrvconfig
-sbin/papif
-sbin/papof
-sbin/aufs
-sbin/sizeserver
-sbin/afpidsrvr
-sbin/afpidlist
-sbin/afpidtool
-sbin/aarpd
-lib/libcap.a
-lib/libafp.a
-lib/libafpc.a
-include/netat/aberrors.h
-include/netat/abnbp.h
-include/netat/abqueue.h
-include/netat/afp.h
-include/netat/afpc.h
-include/netat/afpcmd.h
-include/netat/afppass.h
-include/netat/appletalk.h
-include/netat/compat.h
-include/netat/fcntldomv.h
-include/netat/macfile.h
-include/netat/sysvcompat.h
-etc/cap/start-cap-servers.sample
-etc/cap/lib.cap.macusers.sample
-etc/cap/list-cap-servers.sample
-etc/cap/kill-cap-servers.sample
-etc/cap/cap.printers.sample
-lib/cap/afpfile.sample
-lib/cap/DBfile.sample
-lib/cap/LWFonts.sample
-lib/cap/LWIIfgFonts.sample
-lib/cap/LWPlusFonts.sample
-lib/cap/query.ps.sample
-lib/cap/afpvols.sample
-%%PORTDOCS%%%%DOCSDIR%%/abmisc.doc
-%%PORTDOCS%%%%DOCSDIR%%/asp.notes
-%%PORTDOCS%%%%DOCSDIR%%/atp.notes
-%%PORTDOCS%%%%DOCSDIR%%/cap.auth.doc
-%%PORTDOCS%%%%DOCSDIR%%/cap.notes
-%%PORTDOCS%%%%DOCSDIR%%/glossary
-%%PORTDOCS%%%%DOCSDIR%%/install.ms
-%%PORTDOCS%%%%DOCSDIR%%/iptalk.cookbook
-%%PORTDOCS%%%%DOCSDIR%%/nbp.ext
-%%PORTDOCS%%%%DOCSDIR%%/pap.notes
-%%PORTDOCS%%%%DOCSDIR%%/print.cookbook
-%%PORTDOCS%%%%DOCSDIR%%/sched.notes
-%%PORTDOCS%%%%DOCSDIR%%/uab.desc.ms
-%%PORTDOCS%%%%DOCSDIR%%/uar.cookbook
-%%PORTDOCS%%%%DOCSDIR%%/CAP.faq
-%%PORTDOCS%%%%DOCSDIR%%/CAP60.README
-%%PORTDOCS%%%%DOCSDIR%%/NOTICE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/papif.README
-%%PORTDOCS%%%%DOCSDIR%%/lwsrv.README
-%%PORTDOCS%%%%DOCSDIR%%/aufs.README
-%%PORTDOCS%%%%DOCSDIR%%/doc.README
-%%PORTDOCS%%%%DOCSDIR%%/applications.README
-%%PORTDOCS%%%%DOCSDIR%%/uab.README
-%%PORTDOCS%%%%DOCSDIR%%/ethertalk.README
-@dirrm include/netat
-@dirrm etc/cap
-@dirrm lib/cap
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/cap/scripts/configure b/net/cap/scripts/configure
deleted file mode 100644
index f28746bf5489..000000000000
--- a/net/cap/scripts/configure
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-if [ X"${BATCH}" != X"yes" ]; then
- echo "This port comes with reasonable defaults as follows:"
- echo " Native Ethertalk with Phase 2 compatibility."
- echo " Critical AUFS stat() calls to be cached. (STAT_CACHE)"
- echo " USR1 signal makes parent aufs re-read system volumes file. (REREAD_AFPVOLS)"
- echo " Pid of aufs is dumped to /var/run/aufs.pid. (PID_FILE)"
- echo " User defined file suffix to creator/type/xlate mapping. (USR_FILE_TYPES)"
- echo " Automatically create user .afpvols and 'mac' directories if non-existent."
- echo " (CREATE_AFPVOL)"
- echo " Fix permissions on network trash stuff. (NETWORKTRASH)"
- echo " Add entry to the 'wtmp' file for each AUFS connection. (LOG_WTMP)"
- echo " Run lpd job as Chooser Name if it is valid UNIX account and "
- echo " refuse printing if Chooser name is invalid. (RUN_AS_USER, USER_REQUIRED)"
- echo " Lpr output to stdout/stderr are included in lwsrv log. (LWSRV_LPR_LOG)"
- echo
- echo -n "Would you like to use them? (y/n)> "
- read ans
- case ${ans} in
- y*|Y*) BATCH=yes ;;
- esac
- fi
-
-echo "===> Copying custom m4.features file."
-cp ${FILESDIR}/m4.features ${WRKSRC}
-
-if [ X"${BATCH}" != X"yes" ]; then
- (cd ${WRKSRC}; ./Configure)
- else
- sed -e s+@CWD@+${WRKSRC}+ -e s+@PREFIX@+${PREFIX}+ \
- ${FILESDIR}/m4.setup.in > ${WRKSRC}/m4.setup
- (cd ${WRKSRC}; ./gen.makes)
- fi
diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile
deleted file mode 100644
index d18da9d395fc..000000000000
--- a/net/ggsd/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for: ggsd
-# Date created: 14 February 1999
-# Whom: Dima Sivachenko <dima@chg.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME= ggsd
-PORTVERSION= 0.1
-PORTREVISION= 4
-CATEGORIES= net
-MASTER_SITES= http://freebsd.unixfreunde.de/sources/
-DISTNAME= ggsd
-EXTRACT_SUFX= .tar
-
-MAINTAINER= demon@FreeBSD.org
-COMMENT= Start a network server to execute scripts
-
-BROKEN= Does not compile with GCC 4.2
-DEPRECATED= does not compile on FreeBSD 7.x or newer
-EXPIRATION_DATE=2011-04-17
-
-EXTRACT_CMD= ${TAR}
-EXTRACT_BEFORE_ARGS= -xf
-EXTRACT_AFTER_ARGS= # empty
-
-WRKSRC= ${WRKDIR}/GGSD
-
-USE_GNOME= gtk12
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/ggsd ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/example.scr ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/ggsd/distinfo b/net/ggsd/distinfo
deleted file mode 100644
index 3058232c86dd..000000000000
--- a/net/ggsd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ggsd.tar) = 9f98fdce9838ac99e678f1b2f4fb2b5ee4caa0d9738b67b9663a3e516f1b2232
-SIZE (ggsd.tar) = 61440
diff --git a/net/ggsd/files/patch-aa b/net/ggsd/files/patch-aa
deleted file mode 100644
index e2ebf9924a23..000000000000
--- a/net/ggsd/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig Fri Feb 12 16:22:22 1999
-+++ Makefile Sat Jul 1 18:31:53 2000
-@@ -1,6 +1,7 @@
--CC=gcc
--CFLAGS=-Wall -O -DUSE_GUI `gtk-config --cflags` -DVERSION=\"0.1\"
--LIBS=`gtk-config --libs`
-+CC?=gcc
-+CFLAGS?=-O
-+CFLAGS+=-DUSE_GUI `$(GTK_CONFIG) --cflags` -DVERSION=\"0.1\"
-+LIBS=`$(GTK_CONFIG) --libs`
-
- all:
- $(CC) $(CFLAGS) -o ggsd ggsd.c $(LIBS)
diff --git a/net/ggsd/pkg-descr b/net/ggsd/pkg-descr
deleted file mode 100644
index 14fb15af0f80..000000000000
--- a/net/ggsd/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-GGSD is a Generic Graphical Server Daemon. It allows anyone to make a simple
-script and then start a network server to run it.
-
---Dima
-dima@chg.ru
diff --git a/net/ggsd/pkg-plist b/net/ggsd/pkg-plist
deleted file mode 100644
index 0bf101432c56..000000000000
--- a/net/ggsd/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/ggsd
-share/doc/ggsd/README
-share/doc/ggsd/example.scr
-@dirrm share/doc/ggsd
diff --git a/net/penguintv/Makefile b/net/penguintv/Makefile
deleted file mode 100644
index 3c599fcdd446..000000000000
--- a/net/penguintv/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# New ports collection makefile for: PenguinTV
-# Date created: 14 March 2006
-# Whom: Edwin Groothuis <edwin@mavetju.org>
-#
-# $FreeBSD$
-
-PORTNAME= PenguinTV
-PORTVERSION= 4.1.0
-PORTREVISION= 3
-CATEGORIES= net audio multimedia
-MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/4.1
-DISTNAME= penguintv_${PORTVERSION}-0
-
-MAINTAINER= edwin@mavetju.org
-COMMENT= Graphical RSS feed reader with incorperated playback functions - development version
-
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/py-pysqlite21 \
- ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \
- ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:${PORTSDIR}/devel/py-notify \
- ${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
- ${PYXML} \
- ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex \
- ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
-BROKEN= does not build
-DEPRECATED= has been broken for a half year
-EXPIRATION_DATE=2011-04-17
-
-WRKSRC= ${WRKDIR}/PenguinTV-${PORTVERSION}
-
-OPTIONS= PYLUCENE "Use Lucene search engine" ON \
- GSTREAMER "Use GStreamer engine" ON
-
-USE_GNOME= pygnomeextras pygnome2
-USE_PYTHON= yes
-USE_GECKO= libxul
-USE_DISPLAY= yes
-
-CONFLICTS= PenguinTV-devel-[0-9]*
-
-PLIST_SUB= PY_VERSION=${PYTHON_VERSION:S/thon//} PORTVERSION=${PORTVERSION}
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_GSTREAMER)
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
-.endif
-
-.if defined(WITHOUT_PYLUCENE)
-#BROKEN= Cannot be run without PyLucene
-.else
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/lucene/_lucene.so:${PORTSDIR}/textproc/py-lucene
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," \
- ${WRKSRC}/penguintv/utils.py
-
-do-build:
- cd ${WRKSRC} && ${PYTHON_CMD} setup.py build
-
-do-install:
- cd ${WRKSRC} && ${PYTHON_CMD} setup.py install
-
-.include <bsd.port.post.mk>
diff --git a/net/penguintv/distinfo b/net/penguintv/distinfo
deleted file mode 100644
index 663ec2d703ae..000000000000
--- a/net/penguintv/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (penguintv_4.1.0-0.tar.gz) = 5a8911ec0f6775f3fa30d381c8958a522664eddcce2a68c2bc6925020e74d070
-SIZE (penguintv_4.1.0-0.tar.gz) = 423685
diff --git a/net/penguintv/files/patch-penguintv-utils.py b/net/penguintv/files/patch-penguintv-utils.py
deleted file mode 100644
index d630ad99a95a..000000000000
--- a/net/penguintv/files/patch-penguintv-utils.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- penguintv/utils.py.orig 2009-03-23 08:35:01.000000000 +1100
-+++ penguintv/utils.py 2009-03-23 08:35:31.000000000 +1100
-@@ -228,7 +228,8 @@
- os.path.join(os.path.split(os.path.abspath(sys.argv[0]))[0],"share"),
- os.path.join(GetPrefix(),"share","sugar","activities","ptv","share"),
- os.path.join(os.path.split(os.path.split(utils.__file__)[0])[0],'share','glade'),
-- "/usr/share/penguintv/glade"):
-+ "/usr/share/penguintv/glade",
-+ "%%LOCALBASE%%/penguintv/glade"):
- try:
- os.stat(os.path.join(p,"dialogs.glade"))
- logging.debug("glade prefix found: %s" % (p,))
diff --git a/net/penguintv/files/patch-share_defaults.opml b/net/penguintv/files/patch-share_defaults.opml
deleted file mode 100644
index 9650edffb3a5..000000000000
--- a/net/penguintv/files/patch-share_defaults.opml
+++ /dev/null
@@ -1,22 +0,0 @@
---- share/defaultsubs.opml.orig 2009-03-23 13:37:19.000000000 +1100
-+++ share/defaultsubs.opml 2009-03-23 13:40:39.000000000 +1100
-@@ -27,3 +27,19 @@
- title="Planet GNOME">
- </outline>
- </body></opml>
-+ <outline xmlUrl="http://planet.freebsdish.org/rss20.xml"
-+ text="Planet FreeBSD"
-+ description="Planet FreeBSD - http://planet.freebsdish.org/"
-+ title="Planet FreeBSD">
-+ </outline>
-+ <outline xmlUrl="http://planet.freebsdish.org/complete/rss20.xml"
-+ text="Planet FreeBSD - Complete"
-+ description="Planet FreeBSD - http://planet.freebsdish.org/complete/"
-+ title="Planet FreeBSD - Complete">
-+ </outline>
-+ <outline xmlUrl="http://www.mavetju.org/unix/multimedia/freebsd/multimedia.xml"
-+ text="FreeBSD Multimedia Resources List"
-+ description="FreeBSD Multimedia Resources List - http://www.freebsd.org/multimedia/multimedia.html"
-+ title="FreeBSD Multimedia Resources List">
-+ </outline>
-+</body></opml>
diff --git a/net/penguintv/pkg-descr b/net/penguintv/pkg-descr
deleted file mode 100644
index a3dbcda7fe92..000000000000
--- a/net/penguintv/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-PenguinTV is not just another RSS feed reader. It is designed from
-the ground up to work seamlessly with podcasts and video blogs,
-allowing you to easily enjoy the audio, music, and video published
-around the web in RSS format.
-
-Until now, the only solutions for listening to podcasts on Linux
-have been clunky apps and unreliable bash scripts. Many solutions
-require the user to browse file directories named by date to find
-media files. With the large amount of information in podcasts and
-videos, a user needs help to keep track of everything.
-
-PenguinTV eliminates all of these problems with a light-weight but
-powerful interface that shows you what you need to know, and hides
-what you don't. You can immediately see what you've watched, what's
-available to view, and which media are downloading. You don't have
-to worry about where files are stored, what their names are, or
-what format they are in. Rather than try to reinvent the wheel by
-coding its own media player, PenguinTV launches the media player
-of your choice to view your downloads.
-
-WWW: http://penguintv.sourceforge.net/
-Author: Owen Williams <ywwg@usa.net>
diff --git a/net/penguintv/pkg-message b/net/penguintv/pkg-message
deleted file mode 100644
index de36eb7260cc..000000000000
--- a/net/penguintv/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
------------------------------ 8< -----------------------------------------
-Please note that this program requires that libsqlite3
-(databases/sqlite3-threads) has threads enabled. This is not happening
-by default, and if you install it from a package you don't have
-threads support. Reinstall databases/sqlite3-threads if you don't
-have this.
------------------------------ 8< -----------------------------------------
-If PenguinTV complains that it can't find run-mozilla.sh,
-use this to start it up:
-$ WITH_MOZ_DIR=/usr/local/lib/firefox/run-mozilla.sh PenguinTV
------------------------------ 8< -----------------------------------------
diff --git a/net/penguintv/pkg-plist b/net/penguintv/pkg-plist
deleted file mode 100644
index 293421baeb34..000000000000
--- a/net/penguintv/pkg-plist
+++ /dev/null
@@ -1,239 +0,0 @@
-bin/PenguinTV
-share/applications/penguintv.desktop
-share/locale/pt/LC_MESSAGES/penguintv.mo
-share/locale/pt_BR/LC_MESSAGES/penguintv.mo
-share/locale/sv/LC_MESSAGES/penguintv.mo
-share/penguintv/defaultsubs.opml
-share/penguintv/mozilla-planet-hildon.css
-share/penguintv/mozilla-planet.css
-share/penguintv/mozilla.css
-share/penguintv/penguintv.glade
-share/penguintv/penguintvicon.png
-share/penguintv/pixmaps/ev_offline.png
-share/penguintv/pixmaps/ev_online.png
-share/penguintv/pixmaps/throbber.gif
-share/pixmaps/penguintvicon.png
-share/dbus-1/services/penguintv.service
-
-%%PYTHON_SITELIBDIR%%/PenguinTV-%%PORTVERSION%%-%%PY_VERSION%%.egg-info
-%%PYTHON_SITELIBDIR%%/penguintv/AddFeedDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/AddFeedDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/AddFeedUtils.py
-%%PYTHON_SITELIBDIR%%/penguintv/AddFeedUtils.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/AddSearchTagDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/AddSearchTagDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ArticleSync.py
-%%PYTHON_SITELIBDIR%%/penguintv/ArticleSync.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/BTDownloader.py
-%%PYTHON_SITELIBDIR%%/penguintv/BTDownloader.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/BeautifulSoup/BeautifulSoup.py
-%%PYTHON_SITELIBDIR%%/penguintv/BeautifulSoup/BeautifulSoup.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/BeautifulSoup/__init__.py
-%%PYTHON_SITELIBDIR%%/penguintv/BeautifulSoup/__init__.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/DownloadView.py
-%%PYTHON_SITELIBDIR%%/penguintv/DownloadView.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/Downloader.py
-%%PYTHON_SITELIBDIR%%/penguintv/Downloader.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/EditSearchesDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/EditSearchesDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/EntryFormatter.py
-%%PYTHON_SITELIBDIR%%/penguintv/EntryFormatter.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/EntryList.py
-%%PYTHON_SITELIBDIR%%/penguintv/EntryList.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/EntryView.py
-%%PYTHON_SITELIBDIR%%/penguintv/EntryView.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/FeedFilterDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/FeedFilterDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/FeedFilterPropertiesDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/FeedFilterPropertiesDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/FeedList.py
-%%PYTHON_SITELIBDIR%%/penguintv/FeedList.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/FeedPropertiesDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/FeedPropertiesDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/FilterSelectorDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/FilterSelectorDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/FtpSyncClient.py
-%%PYTHON_SITELIBDIR%%/penguintv/FtpSyncClient.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/GStreamerPlayer.py
-%%PYTHON_SITELIBDIR%%/penguintv/GStreamerPlayer.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/HTTPDownloader.py
-%%PYTHON_SITELIBDIR%%/penguintv/HTTPDownloader.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/HildonListener.py
-%%PYTHON_SITELIBDIR%%/penguintv/HildonListener.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/IconManager.py
-%%PYTHON_SITELIBDIR%%/penguintv/IconManager.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/LoginDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/LoginDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/Lucene.py
-%%PYTHON_SITELIBDIR%%/penguintv/Lucene.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/MainWindow.py
-%%PYTHON_SITELIBDIR%%/penguintv/MainWindow.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/MediaManager.py
-%%PYTHON_SITELIBDIR%%/penguintv/MediaManager.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/OPML.py
-%%PYTHON_SITELIBDIR%%/penguintv/OPML.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/OfflineImageCache.py
-%%PYTHON_SITELIBDIR%%/penguintv/OfflineImageCache.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/PTVXapian.py
-%%PYTHON_SITELIBDIR%%/penguintv/PTVXapian.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/PlanetView.py
-%%PYTHON_SITELIBDIR%%/penguintv/PlanetView.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/Player.py
-%%PYTHON_SITELIBDIR%%/penguintv/Player.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/Poller.py
-%%PYTHON_SITELIBDIR%%/penguintv/Poller.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/PreferencesDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/PreferencesDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/PtvTrayIcon.py
-%%PYTHON_SITELIBDIR%%/penguintv/PtvTrayIcon.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/S3SyncClient.py
-%%PYTHON_SITELIBDIR%%/penguintv/S3SyncClient.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/SimpleImageCache.py
-%%PYTHON_SITELIBDIR%%/penguintv/SimpleImageCache.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/SqliteSyncClient.py
-%%PYTHON_SITELIBDIR%%/penguintv/SqliteSyncClient.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/SynchronizeDialog.py
-%%PYTHON_SITELIBDIR%%/penguintv/SynchronizeDialog.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/TagEditorNG.py
-%%PYTHON_SITELIBDIR%%/penguintv/TagEditorNG.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ThreadPool.py
-%%PYTHON_SITELIBDIR%%/penguintv/ThreadPool.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/UpdateTasksManager.py
-%%PYTHON_SITELIBDIR%%/penguintv/UpdateTasksManager.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/__init__.py
-%%PYTHON_SITELIBDIR%%/penguintv/__init__.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ajax/EntryInfoServer.py
-%%PYTHON_SITELIBDIR%%/penguintv/ajax/EntryInfoServer.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ajax/MyTCPServer.py
-%%PYTHON_SITELIBDIR%%/penguintv/ajax/MyTCPServer.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ajax/__init__.py
-%%PYTHON_SITELIBDIR%%/penguintv/ajax/__init__.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/amazon/S3.py
-%%PYTHON_SITELIBDIR%%/penguintv/amazon/S3.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/amazon/__init__.py
-%%PYTHON_SITELIBDIR%%/penguintv/amazon/__init__.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/feedparser.py
-%%PYTHON_SITELIBDIR%%/penguintv/feedparser.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/itunes.py
-%%PYTHON_SITELIBDIR%%/penguintv/itunes.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/penguintv.py
-%%PYTHON_SITELIBDIR%%/penguintv/penguintv.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvDB.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvDB.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvDbus.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvDbus.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptv_sync.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptv_sync.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Choker.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Choker.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Connecter.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Connecter.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/CurrentRateMeasure.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/CurrentRateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Downloader.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Downloader.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/DownloaderFeedback.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/DownloaderFeedback.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Encrypter.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Encrypter.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/HTTPHandler.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/HTTPHandler.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/NatCheck.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/NatCheck.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/PiecePicker.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/PiecePicker.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RateMeasure.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RawServer.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/RawServer.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Rerequester.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Rerequester.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Storage.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Storage.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/StorageWrapper.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/StorageWrapper.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Uploader.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/Uploader.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/__init__.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/__init__.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bencode.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bencode.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bitfield.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/bitfield.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btcompletedir.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btcompletedir.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btformats.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btformats.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btmakemetafile.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/btmakemetafile.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/download.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/download.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/fakeopen.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/fakeopen.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/parseargs.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/parseargs.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/selectpoll.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/selectpoll.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/spewout.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/spewout.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/testtest.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/testtest.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/track.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/track.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/zurllib.py
-%%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent/zurllib.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/subProcess.py
-%%PYTHON_SITELIBDIR%%/penguintv/subProcess.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/trayicon/SonataNotification.py
-%%PYTHON_SITELIBDIR%%/penguintv/trayicon/SonataNotification.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/trayicon/TrayIcon.py
-%%PYTHON_SITELIBDIR%%/penguintv/trayicon/TrayIcon.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/trayicon/__init__.py
-%%PYTHON_SITELIBDIR%%/penguintv/trayicon/__init__.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/utils.py
-%%PYTHON_SITELIBDIR%%/penguintv/utils.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/html/PTVMozilla.py
-%%PYTHON_SITELIBDIR%%/penguintv/html/PTVGtkHtml.py
-%%PYTHON_SITELIBDIR%%/penguintv/html/__init__.py
-%%PYTHON_SITELIBDIR%%/penguintv/html/PTVhtml.py
-%%PYTHON_SITELIBDIR%%/penguintv/html/PTVMozilla.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/html/PTVGtkHtml.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/html/__init__.pyc
-%%PYTHON_SITELIBDIR%%/penguintv/html/PTVhtml.pyc
-
-share/penguintv/gtkhtml.css
-share/penguintv/glade/widescreen.glade
-share/penguintv/glade/vertical.glade
-share/penguintv/glade/standard.glade
-share/penguintv/glade/planet.glade
-share/penguintv/glade/extra_dialogs.glade
-share/penguintv/glade/dialogs.glade
-share/penguintv/glade/dialog_add_feed.glade
-share/penguintv/glade/desktop.glade
-share/icons/hicolor/scalable/hildon/penguintvicon.png
-share/icons/hicolor/scalable/apps/penguintvicon.png
-share/icons/hicolor/64x64/hildon/penguintvicon.png
-share/icons/hicolor/64x64/apps/penguintvicon.png
-share/icons/hicolor/40x40/hildon/penguintvicon.png
-share/icons/hicolor/40x40/apps/penguintvicon.png
-share/icons/hicolor/26x26/hildon/penguintvicon.png
-share/icons/hicolor/26x26/apps/penguintvicon.png
-
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/BeautifulSoup/
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/ajax
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/amazon
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/trayicon
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv/html
-@dirrm %%PYTHON_SITELIBDIR%%/penguintv
-@dirrm share/penguintv/pixmaps
-@dirrm share/penguintv/glade
-@dirrm share/penguintv
-@dirrm share/icons/hicolor/scalable/hildon
-@dirrm share/icons/hicolor/64x64/hildon
-@dirrm share/icons/hicolor/40x40/hildon
-@dirrm share/icons/hicolor/40x40/apps
-@dirrm share/icons/hicolor/40x40
-@dirrm share/icons/hicolor/26x26/hildon
-@dirrm share/icons/hicolor/26x26/apps
-@dirrm share/icons/hicolor/26x26