Remove expired ports:

2017-01-15 net/cyphesis: Does not compile on FreeBSD 10+
2017-01-15 net/gpxe: does not build on FreeBSD 10.x and later
2017-01-15 net/openospfd: requires old CARP implementation (interface layer)
2017-01-15 security/openbsm-devel: is not needed under FreeBSD 10.x or higher
2017-01-15 security/ssh-copy-id: is already in the base system
2017-01-15 sysutils/apt: does not build on 10+
2017-01-15 archivers/tclmkziplib: Abandonware, please use bundled zlib package [http://tcl.tk/man/tcl8.6/TclCmd/zlib.htm]
2017-01-15 x11-drivers/drm-kmod: this port is only for 9.3 systems
2017-01-15 audio/xmms-openspc: does not build on FreeBSD 10.x and later
2017-01-15 audio/aureal-kmod: does not build (and fetch)
2017-01-15 emulators/doscmd: does not build (accesses field of opaque structure)

26 files changed, 0 insertions, 1125 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index afc76e9de297..bdf5c11fa96c 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -40,7 +40,6 @@
     SUBDIR += apachetop
     SUBDIR += apcpwr
     SUBDIR += apcupsd
-    SUBDIR += apt
     SUBDIR += arcconf
     SUBDIR += archivemount
     SUBDIR += areca-cli
diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile
deleted file mode 100644
index e3a1069203ba..000000000000
--- a/sysutils/apt/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-# Created by: Nick Barkas <snb@threerings.net>
-# $FreeBSD$
-
-PORTNAME=	apt
-PORTVERSION=	0.6.46.4.1
-PORTREVISION=	9
-CATEGORIES=	sysutils
-MASTER_SITES=	DEBIAN_POOL
-DISTNAME=	apt_0.6.46.4-0.1
-
-MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Advanced front-end for dpkg
-
-BROKEN=		does not build on 10+
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=	2017-01-15
-
-BUILD_DEPENDS=	bash:shells/bash \
-		${LOCALBASE}/lib/libpub.a:devel/publib
-RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		dpkg:archivers/dpkg \
-		gpg:security/gnupg1
-LIB_DEPENDS=	libcurl.so:ftp/curl
-
-GNU_CONFIGURE=	yes
-USES=		bdb gettext iconv gmake shebangfix
-SHEBANG_FILES=	dselect/install \
-		dselect/setup \
-		dselect/update
-USE_LDCONFIG=	yes
-NO_FILTER_SHLIBS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include/db${BDB_VER} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib/db${BDB_VER} -L${LOCALBASE}/lib
-WRKSRC=		${WRKDIR}/apt-${PORTVERSION}
-
-DPKGDIR?=	/var/db/dpkg
-APTDIR?=	/var/db/apt
-PLIST_SUB+=	APTDIR=${APTDIR:C,^/,,}
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	${CP} ${FILESDIR}/https.cc ${FILESDIR}/https.h ${WRKSRC}/methods/
-	${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' -e \
-	's|@APTDIR@|${APTDIR}|g' -e 's|@DPKGDIR@|${DPKGDIR}|g' -e \
-	's|@LOCALBASE@|${LOCALBASE}|g' \
-		${WRKSRC}/apt-pkg/deb/debsystem.cc \
-		${WRKSRC}/apt-pkg/init.cc \
-		${WRKSRC}/cmdline/apt-key \
-		${WRKSRC}/dselect/install \
-		${WRKSRC}/dselect/setup \
-		${WRKSRC}/dselect/update \
-		${WRKSRC}/methods/gpgv.cc
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-cache ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-cdrom ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-config ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-extracttemplates ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-ftparchive ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-get ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/apt-sortpkgs ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/apt-key ${STAGEDIR}${PREFIX}/bin
-
-	${INSTALL_DATA} ${WRKSRC}/bin/libapt-inst.so.1.1.0 ${STAGEDIR}${PREFIX}/lib
-	(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libapt-inst.so.1.1.0 libapt-inst.so.1.1; ${LN} -sf libapt-inst.so.1.1.0 libapt-inst.so)
-	${INSTALL_DATA} ${WRKSRC}/bin/libapt-pkg.so.3.11.0 ${STAGEDIR}${PREFIX}/lib
-	(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libapt-pkg.so.3.11.0 libapt-pkg.so.3.11; ${LN} -sf libapt-pkg.so.3.11.0 libapt-pkg.so)
-
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/apt/keyrings
-
-	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/cdrom ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/copy ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/file ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/ftp ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/gpgv ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/gzip ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/http ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/https ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/rred ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/methods/rsh ${STAGEDIR}${PREFIX}/libexec/apt/methods
-	(cd ${STAGEDIR}${PREFIX}/libexec/apt/methods; ${LN} -sf rsh ssh; ${LN} -sf gzip bzip2)
-
-	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
-	${INSTALL_DATA} ${WRKSRC}/scripts/dselect/desc.apt ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
-	${INSTALL_DATA} ${WRKSRC}/scripts/dselect/names ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/install ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/setup ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/dselect/update ${STAGEDIR}${PREFIX}/libexec/dpkg/methods/apt
-
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/apt-pkg
-	${INSTALL_DATA} ${WRKSRC}/include/apt-pkg/* ${STAGEDIR}${PREFIX}/include/apt-pkg
-
-	${INSTALL_MAN} ${WRKSRC}/docs/apt-extracttemplates.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/docs/apt-ftparchive.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/docs/apt-sortpkgs.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
-	${INSTALL_MAN} ${WRKSRC}/docs/apt.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/docs/apt_preferences.5 ${STAGEDIR}${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/docs/sources.list.5 ${STAGEDIR}${MANPREFIX}/man/man5
-
-	${INSTALL_MAN} ${WRKSRC}/docs/apt-cache.8 ${STAGEDIR}${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/docs/apt-cdrom.8 ${STAGEDIR}${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/docs/apt-config.8 ${STAGEDIR}${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/docs/apt-get.8 ${STAGEDIR}${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/docs/apt-key.8 ${STAGEDIR}${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/docs/apt-secure.8 ${STAGEDIR}${MANPREFIX}/man/man8
-
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/apt/conf.d
-	${INSTALL_DATA} ${WRKSRC}/docs/examples/sources.list ${STAGEDIR}${PREFIX}/etc/apt/sources.list.sample
-	${INSTALL_DATA} ${WRKSRC}/docs/examples/apt.conf ${STAGEDIR}${PREFIX}/etc/apt/apt.conf.sample
-
-	@${MKDIR} ${STAGEDIR}${APTDIR}/cache/archives/partial
-	@${MKDIR} ${STAGEDIR}${APTDIR}/state/lists/partial
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/COPYING.GPL ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README.progress-reporting ${STAGEDIR}${DOCSDIR}
-
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_MAN} ${WRKSRC}/docs/examples/* ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/apt/distinfo b/sysutils/apt/distinfo
deleted file mode 100644
index b5e87555666d..000000000000
--- a/sysutils/apt/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (apt_0.6.46.4-0.1.tar.gz) = fab35a62d43d4a3942be095befecb60fc35bd58df43bcd1b9fa11efb497d4429
-SIZE (apt_0.6.46.4-0.1.tar.gz) = 1797866
diff --git a/sysutils/apt/files/https.cc b/sysutils/apt/files/https.cc
deleted file mode 100644
index b2bbbddb1987..000000000000
--- a/sysutils/apt/files/https.cc
+++ /dev/null
@@ -1,273 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
-/* ######################################################################
-
-   HTTPS Acquire Method - This is the HTTPS aquire method for APT.
-   
-   It uses libcurl
-
-   ##################################################################### */
-									/*}}}*/
-// Include Files							/*{{{*/
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/acquire-method.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/hashes.h>
-
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <utime.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <iostream>
-#include <apti18n.h>
-#include <sstream>
-
-#include "config.h"
-#include "https.h"
-
-									/*}}}*/
-using namespace std;
-
-size_t 
-HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
-{
-   HttpsMethod *me = (HttpsMethod *)userp;
-
-   if(me->File->Write(buffer, size*nmemb) != true)
-      return false;
-
-   return size*nmemb;
-}
-
-int 
-HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, 
-			      double ultotal, double ulnow)
-{
-   HttpsMethod *me = (HttpsMethod *)clientp;
-   if(dltotal > 0 && me->Res.Size == 0) {
-      me->Res.Size = (unsigned long)dltotal;
-      me->URIStart(me->Res);
-   }
-   return 0;
-}
-
-void HttpsMethod::SetupProxy()
-{
-   URI ServerName = Queue->Uri;
-
-   // Determine the proxy setting
-   if (getenv("http_proxy") == 0)
-   {
-      string DefProxy = _config->Find("Acquire::http::Proxy");
-      string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
-      if (SpecificProxy.empty() == false)
-      {
-	 if (SpecificProxy == "DIRECT")
-	    Proxy = "";
-	 else
-	    Proxy = SpecificProxy;
-      }   
-      else
-	 Proxy = DefProxy;
-   }
-   
-   // Parse no_proxy, a , separated list of domains
-   if (getenv("no_proxy") != 0)
-   {
-      if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
-	 Proxy = "";
-   }
-   
-   // Determine what host and port to use based on the proxy settings
-   string Host;   
-   if (Proxy.empty() == true || Proxy.Host.empty() == true)
-   {
-   }
-   else
-   {
-      if (Proxy.Port != 0)
-	 curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
-      curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
-   }
-}
-
-
-// HttpsMethod::Fetch - Fetch an item					/*{{{*/
-// ---------------------------------------------------------------------
-/* This adds an item to the pipeline. We keep the pipeline at a fixed
-   depth. */
-bool HttpsMethod::Fetch(FetchItem *Itm)
-{
-   stringstream ss;
-   struct stat SBuf;
-   struct curl_slist *headers=NULL;  
-   char curl_errorstr[CURL_ERROR_SIZE];
-   long curl_responsecode;
-
-   // TODO:
-   //       - http::Timeout
-   //       - http::Pipeline-Depth
-   //       - error checking/reporting
-   //       - more debug options? (CURLOPT_DEBUGFUNCTION?)
-
-   curl_easy_reset(curl);
-   SetupProxy();
-
-   // callbacks
-   curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str());
-   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-   curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
-   curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback);
-   curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this);
-   curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
-   curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
-   curl_easy_setopt(curl, CURLOPT_FILETIME, true);
-
-   // FIXME: https: offer various options of verification
-   bool peer_verify = _config->FindB("Acquire::https::Verify-Peer", false);
-   curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, peer_verify);
-
-   // sslcert file
-   string pem = _config->Find("Acquire::https::SslCert","");
-   if(pem != "")
-      curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str());
-   
-   // CA-Dir
-   string certdir = _config->Find("Acquire::https::CaPath","");
-   if(certdir != "")
-      curl_easy_setopt(curl, CURLOPT_CAPATH, certdir.c_str());
-   
-   // Server-verify 
-   int verify = _config->FindI("Acquire::https::Verify-Host",2);
-   curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify);
-
-   // cache-control
-   if(_config->FindB("Acquire::http::No-Cache",false) == false)
-   {
-      // cache enabled
-      if (_config->FindB("Acquire::http::No-Store",false) == true)
-	 headers = curl_slist_append(headers,"Cache-Control: no-store");
-      ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::http::Max-Age",0));
-      headers = curl_slist_append(headers, ss.str().c_str());
-   } else {
-      // cache disabled by user
-      headers = curl_slist_append(headers, "Cache-Control: no-cache");
-      headers = curl_slist_append(headers, "Pragma: no-cache");
-   }
-   curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
-
-   // speed limit
-   int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024;
-   if (dlLimit > 0)
-      curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit);
-
-   // set header
-   curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")");
-
-   // debug
-   if(_config->FindB("Debug::Acquire::https", false))
-      curl_easy_setopt(curl, CURLOPT_VERBOSE, true);
-
-   // error handling
-   curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
-
-   // if we have the file send an if-range query with a range header
-   if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
-   {
-      char Buf[1000];
-      sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n",
-	      (long)SBuf.st_size - 1,
-	      TimeRFC1123(SBuf.st_mtime).c_str());
-      headers = curl_slist_append(headers, Buf);
-   } 
-   else if(Itm->LastModified > 0)
-   {
-      curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
-      curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified);
-   }
-
-   // go for it - if the file exists, append on it
-   File = new FileFd(Itm->DestFile, FileFd::WriteAny);
-   if (File->Size() > 0)
-      File->Seek(File->Size() - 1);
-   
-   // keep apt updated
-   Res.Filename = Itm->DestFile;
-
-   // get it!
-   CURLcode success = curl_easy_perform(curl);
-   curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &curl_responsecode);
-
-   long curl_servdate;
-   curl_easy_getinfo(curl, CURLINFO_FILETIME, &curl_servdate);
-
-   // cleanup
-   if(success != 0) 
-   {
-      unlink(File->Name().c_str());
-      _error->Error(curl_errorstr);
-      Fail();
-      return true;
-   }
-   File->Close();
-
-   // Timestamp
-   struct utimbuf UBuf;
-   if (curl_servdate != -1) {
-       UBuf.actime = curl_servdate;
-       UBuf.modtime = curl_servdate;
-       utime(File->Name().c_str(),&UBuf);
-   }
-
-   // check the downloaded result
-   struct stat Buf;
-   if (stat(File->Name().c_str(),&Buf) == 0)
-   {
-      Res.Filename = File->Name();
-      Res.LastModified = Buf.st_mtime;
-      Res.IMSHit = false;
-      if (curl_responsecode == 304)
-      {
-	 unlink(File->Name().c_str());
-	 Res.IMSHit = true;
-	 Res.LastModified = Itm->LastModified;
-	 Res.Size = 0;
-	 URIDone(Res);
-	 return true;
-      }
-      Res.Size = Buf.st_size;
-   }
-
-   // take hashes
-   Hashes Hash;
-   FileFd Fd(Res.Filename, FileFd::ReadOnly);
-   Hash.AddFD(Fd.Fd(), Fd.Size());
-   Res.TakeHashes(Hash);
-   
-   // keep apt updated
-   URIDone(Res);
-
-   // cleanup
-   Res.Size = 0;
-   delete File;
-   curl_slist_free_all(headers);
-
-   return true;
-};
-
-int main()
-{
-   setlocale(LC_ALL, "");
-
-   HttpsMethod Mth;
-   curl_global_init(CURL_GLOBAL_SSL) ;
-
-   return Mth.Run();
-}
-
-
diff --git a/sysutils/apt/files/https.h b/sysutils/apt/files/https.h
deleted file mode 100644
index 2c33d95ee10d..000000000000
--- a/sysutils/apt/files/https.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
-// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
-/* ######################################################################
-
-   HTTP Acquire Method - This is the HTTP aquire method for APT.
-
-   ##################################################################### */
-									/*}}}*/
-
-#ifndef APT_HTTP_H
-#define APT_HTTP_H
-
-#define MAXLEN 360
-
-#include <iostream>
-#include <curl/curl.h>
-
-using std::cout;
-using std::endl;
-
-class HttpsMethod;
-
-
-class HttpsMethod : public pkgAcqMethod
-{
-
-   virtual bool Fetch(FetchItem *);
-   static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
-   static int progress_callback(void *clientp, double dltotal, double dlnow, 
-				double ultotal, double ulnow);
-   void SetupProxy();
-   CURL *curl;
-   FetchResult Res;
-
-   public:
-   FileFd *File;
-      
-   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig) 
-   {
-      File = 0;
-      curl = curl_easy_init();
-   };
-};
-
-URI Proxy;
-
-#endif
diff --git a/sysutils/apt/files/patch-apt-pkg__contrib__fileutl.h b/sysutils/apt/files/patch-apt-pkg__contrib__fileutl.h
deleted file mode 100644
index f47e1a3e8cfc..000000000000
--- a/sysutils/apt/files/patch-apt-pkg__contrib__fileutl.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./apt-pkg/contrib/fileutl.h.orig	2014-08-16 19:31:39.000000000 -0400
-+++ ./apt-pkg/contrib/fileutl.h	2014-08-16 19:31:52.000000000 -0400
-@@ -25,6 +25,7 @@
- #pragma interface "apt-pkg/fileutl.h"
- #endif 
- 
-+#include <sys/types.h>
- #include <string>
- 
- using std::string;
diff --git a/sysutils/apt/files/patch-apt-pkg_deb_debsystem.cc b/sysutils/apt/files/patch-apt-pkg_deb_debsystem.cc
deleted file mode 100644
index 9bed53d71e6e..000000000000
--- a/sysutils/apt/files/patch-apt-pkg_deb_debsystem.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- apt-pkg/deb/debsystem.cc.orig	Thu Mar  2 06:11:39 2006
-+++ apt-pkg/deb/debsystem.cc	Wed Oct 25 15:09:29 2006
-@@ -162,8 +162,8 @@
-       which is yet to be determined. The functions in pkgcachegen should
-       be the only users of these */
-    Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct
--   Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
--   Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
-+   Cnf.CndSet("Dir::State::status","@DPKGDIR@/status");
-+   Cnf.CndSet("Dir::Bin::dpkg","@LOCALBASE@/bin/dpkg");
- 
-    if (StatusFile) {
-      delete StatusFile;
-@@ -191,9 +191,9 @@
- signed debSystem::Score(Configuration const &Cnf)
- {
-    signed Score = 0;
--   if (FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true)
-+   if (FileExists(Cnf.FindFile("Dir::State::status","@DPKGDIR@/status")) == true)
-        Score += 10;
--   if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","/usr/bin/dpkg")) == true)
-+   if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","@LOCALBASE@/bin/dpkg")) == true)
-       Score += 10;
-    if (FileExists("/etc/debian_version") == true)
-       Score += 10;
diff --git a/sysutils/apt/files/patch-apt-pkg_deb_dpkgpm.cc b/sysutils/apt/files/patch-apt-pkg_deb_dpkgpm.cc
deleted file mode 100644
index b0481cfc6839..000000000000
--- a/sysutils/apt/files/patch-apt-pkg_deb_dpkgpm.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- apt-pkg/deb/dpkgpm.cc.orig	Sat Sep 30 07:17:49 2006
-+++ apt-pkg/deb/dpkgpm.cc	Mon Oct 23 13:42:03 2006
-@@ -515,8 +515,8 @@
-          it forks scripts. What happens is that when you hit ctrl-c it sends
- 	 it to all processes in the group. Since dpkg ignores the signal 
- 	 it doesn't die but we do! So we must also ignore it */
--      sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN);
--      sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
-+      sig_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN);
-+      sig_t old_SIGINT = signal(SIGINT,SIG_IGN);
- 	
-        // Fork dpkg
-       pid_t Child;
diff --git a/sysutils/apt/files/patch-apt-pkg_init.cc b/sysutils/apt/files/patch-apt-pkg_init.cc
deleted file mode 100644
index 22536c70e01c..000000000000
--- a/sysutils/apt/files/patch-apt-pkg_init.cc
+++ /dev/null
@@ -1,41 +0,0 @@
---- apt-pkg/init.cc.orig	Thu Mar  2 06:27:13 2006
-+++ apt-pkg/init.cc	Thu Nov  2 13:36:53 2006
-@@ -43,26 +43,19 @@
-    Cnf.Set("Dir","/");
-    
-    // State   
--   Cnf.Set("Dir::State","var/lib/apt/");
-+   Cnf.Set("Dir::State","@APTDIR@/state");
-    
--   /* Just in case something goes horribly wrong, we can fall back to the
--      old /var/state paths.. */
--   struct stat St;   
--   if (stat("/var/lib/apt/.",&St) != 0 &&
--       stat("/var/state/apt/.",&St) == 0)
--      Cnf.Set("Dir::State","var/state/apt/");
--       
-    Cnf.Set("Dir::State::lists","lists/");
-    Cnf.Set("Dir::State::cdroms","cdroms.list");
-    
-    // Cache
--   Cnf.Set("Dir::Cache","var/cache/apt/");
-+   Cnf.Set("Dir::Cache","@APTDIR@/cache");
-    Cnf.Set("Dir::Cache::archives","archives/");
-    Cnf.Set("Dir::Cache::srcpkgcache","srcpkgcache.bin");
-    Cnf.Set("Dir::Cache::pkgcache","pkgcache.bin");
-    
-    // Configuration
--   Cnf.Set("Dir::Etc","etc/apt/");
-+   Cnf.Set("Dir::Etc","@PREFIX@/etc/apt/");
-    Cnf.Set("Dir::Etc::sourcelist","sources.list");
-    Cnf.Set("Dir::Etc::sourceparts","sources.list.d");
-    Cnf.Set("Dir::Etc::vendorlist","vendors.list");
-@@ -70,7 +63,7 @@
-    Cnf.Set("Dir::Etc::main","apt.conf");
-    Cnf.Set("Dir::Etc::parts","apt.conf.d");
-    Cnf.Set("Dir::Etc::preferences","preferences");
--   Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
-+   Cnf.Set("Dir::Bin::methods","@PREFIX@/libexec/apt/methods");
-    
-    bool Res = true;
-    
diff --git a/sysutils/apt/files/patch-buildlib_archtable b/sysutils/apt/files/patch-buildlib_archtable
deleted file mode 100644
index f1e7c797faf1..000000000000
--- a/sysutils/apt/files/patch-buildlib_archtable
+++ /dev/null
@@ -1,7 +0,0 @@
---- buildlib/archtable.orig	Thu Mar  2 06:26:52 2006
-+++ buildlib/archtable	Wed Nov 15 13:08:39 2006
-@@ -27,3 +27,4 @@
- s390	s390
- s390x	s390x
- x86_64	amd64
-+amd64	amd64
diff --git a/sysutils/apt/files/patch-buildlib_environment.mak.in b/sysutils/apt/files/patch-buildlib_environment.mak.in
deleted file mode 100644
index 37a651b7a066..000000000000
--- a/sysutils/apt/files/patch-buildlib_environment.mak.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- buildlib/environment.mak.in.orig	Thu Mar  2 05:56:30 2006
-+++ buildlib/environment.mak.in	Wed Oct 25 15:51:02 2006
-@@ -65,7 +65,14 @@
- ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
-    SONAME_MAGIC=-Wl,-soname -Wl,
-    LFLAGS_SO=
--else
-+endif
-+
-+ifneq ($(words $(filter freebsd% %freebsd,$(HOST_OS))),0)
-+   SONAME_MAGIC=-Wl,-soname -Wl,
-+   LFLAGS_SO=
-+endif
-+
-+ifndef SONAME_MAGIC
-    # Do not know how to create shared libraries here.
-    ONLYSTATICLIBS = yes
- endif
diff --git a/sysutils/apt/files/patch-buildlib_ostable b/sysutils/apt/files/patch-buildlib_ostable
deleted file mode 100644
index 831d2481ebef..000000000000
--- a/sysutils/apt/files/patch-buildlib_ostable
+++ /dev/null
@@ -1,10 +0,0 @@
---- buildlib/ostable.orig	Thu Mar  2 05:46:44 2006
-+++ buildlib/ostable	Wed Oct 25 14:58:59 2006
-@@ -16,6 +16,7 @@
- hp-hpux[^-]*	    hp-ux
- sun-solaris[^-]*    solaris
- [^-]*-openbsd[^-]*  openbsd
-+[^-]*-freebsd[^-]*  freebsd
- 
- # Catch all
- .*	unknown
diff --git a/sysutils/apt/files/patch-cmdline_apt-key b/sysutils/apt/files/patch-cmdline_apt-key
deleted file mode 100644
index 995618da7416..000000000000
--- a/sysutils/apt/files/patch-cmdline_apt-key
+++ /dev/null
@@ -1,26 +0,0 @@
---- cmdline/apt-key.orig	Thu Mar  2 06:28:27 2006
-+++ cmdline/apt-key	Tue Oct 24 16:11:08 2006
-@@ -5,18 +5,17 @@
- # We don't use a secret keyring, of course, but gpg panics and
- # implodes if there isn't one available
- 
--GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg"
--GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
-+GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring @PREFIX@/etc/apt/secring.gpg --trustdb-name @PREFIX@/etc/apt/trustdb.gpg"
-+GPG="$GPG_CMD --keyring @PREFIX@/etc/apt/trusted.gpg"
- 
- 
--ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
--REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
-+ARCHIVE_KEYRING=@PREFIX@/share/apt/keyrings/freebsd-archive-keyring.gpg
-+REMOVED_KEYS=@PREFIX@/share/apt/keyrings/freebsd-archive-removed-keys.gpg
- 
- 
- update() {
-     if [ ! -f $ARCHIVE_KEYRING ]; then
--	echo >&2 "ERROR: Can't find the archive-keyring"
--	echo >&2 "Is the debian-archive-keyring package installed?"
-+	echo >&2 "ERROR: Can't find the archive-keyring: $ARCHIVE_KEYRING"
- 	exit 1
-     fi
- 
diff --git a/sysutils/apt/files/patch-cmdline_makefile b/sysutils/apt/files/patch-cmdline_makefile
deleted file mode 100644
index bb14b5632a3c..000000000000
--- a/sysutils/apt/files/patch-cmdline_makefile
+++ /dev/null
@@ -1,51 +0,0 @@
---- cmdline/makefile.orig	Thu Mar  2 05:58:42 2006
-+++ cmdline/makefile	Mon Oct 23 16:38:13 2006
-@@ -7,42 +7,42 @@
- 
- # The apt-cache program
- PROGRAM=apt-cache
--SLIBS = -lapt-pkg
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = apt-cache.cc
- include $(PROGRAM_H)
- 
- # The apt-get program
- PROGRAM=apt-get
--SLIBS = -lapt-pkg
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = apt-get.cc acqprogress.cc
- include $(PROGRAM_H)
- 
- # The apt-config program
- PROGRAM=apt-config
--SLIBS = -lapt-pkg
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = apt-config.cc
- include $(PROGRAM_H)
- 
- # The apt-cdrom program
- PROGRAM=apt-cdrom
--SLIBS = -lapt-pkg
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = apt-cdrom.cc 
- include $(PROGRAM_H)
- 
- # The apt-sortpkgs program
- PROGRAM=apt-sortpkgs
--SLIBS = -lapt-pkg
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = apt-sortpkgs.cc
- include $(PROGRAM_H)
- 
- # The apt-extracttemplates program
- PROGRAM=apt-extracttemplates
--SLIBS = -lapt-pkg -lapt-inst
-+SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = apt-extracttemplates.cc 
- include $(PROGRAM_H)
diff --git a/sysutils/apt/files/patch-configure b/sysutils/apt/files/patch-configure
deleted file mode 100644
index ae108c0cfd24..000000000000
--- a/sysutils/apt/files/patch-configure
+++ /dev/null
@@ -1,161 +0,0 @@
---- configure.orig	Wed Oct 11 00:03:36 2006
-+++ configure	Thu Oct 26 14:32:09 2006
-@@ -7523,8 +7523,8 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for h_errno" >&5
--echo $ECHO_N "checking for h_errno... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking if netdb.h declares h_errno" >&5
-+echo $ECHO_N "checking if netdb.h declares h_errno... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7533,14 +7533,51 @@
- /* end confdefs.h.  */
- #include <netdb.h>
- 
-+int main() { return h_errno; }
-+
- _ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "h_errno" >/dev/null 2>&1; then
--  { echo "$as_me:$LINENO: result: normal" >&5
--echo "${ECHO_T}normal" >&6; }
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+    { ac_try='test -z "$ac_c_werror_flag"
-+            || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+    { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+
-+    aptget_cv_netdb_declares_h_errno=yes
-+
- else
--  CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
--    cat >conftest.$ac_ext <<_ACEOF
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+       aptget_cv_netdb_declares_h_errno=no
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+if test "x$aptget_cv_netdb_declares_h_errno" = "xno"; then
-+   CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
-+fi
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+
-+
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -7548,22 +7585,52 @@
- /* end confdefs.h.  */
- #include <netdb.h>
- 
-+int main() { return h_errno; }
-+
- _ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "h_errno" >/dev/null 2>&1; then
--  { echo "$as_me:$LINENO: result: needs _XOPEN_SOURCE_EXTENDED" >&5
--echo "${ECHO_T}needs _XOPEN_SOURCE_EXTENDED" >&6; }
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+    { ac_try='test -z "$ac_c_werror_flag"
-+            || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+    { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+
-+       aptget_cv_netdb_declares_h_errno=yes
-+
- else
--  { { echo "$as_me:$LINENO: error: \"not found.\"" >&5
--echo "$as_me: error: \"not found.\"" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f conftest*
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+       aptget_cv_netdb_declares_h_errno=no
- 
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- 
-+echo "$as_me:$LINENO: result: $aptget_cv_netdb_declares_h_errno" >&5
-+echo "${ECHO_T}$aptget_cv_netdb_declares_h_errno" >&6
-+
-+if test "x$aptget_cv_netdb_declares_h_errno" = "xno"; then
-+   { { echo "$as_me:$LINENO: error: h_errno is required" >&5
-+echo "$as_me: error: h_errno is required" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- 
- # Extract the first word of "debiandoc2html", so it can be a program name with args.
- set dummy debiandoc2html; ac_word=$2
-@@ -7942,15 +8009,16 @@
- 		{ echo "$as_me:$LINENO: result: $GLIBC_VER" >&5
- echo "${ECHO_T}$GLIBC_VER" >&6; }
- 		ac_cv_glibc_ver=$GLIBC_VER
-+		GLIBC_VER="-$ac_cv_glibc_ver"
- 	else
- 		{ echo "$as_me:$LINENO: WARNING: cannot determine GNU C library minor version number" >&5
- echo "$as_me: WARNING: cannot determine GNU C library minor version number" >&2;}
-+		GLIBC_VER=""
- 	fi
- 	rm -f $dummy $dummy.c
- 
- fi
- 
--	GLIBC_VER="-$ac_cv_glibc_ver"
- 
- 
- { echo "$as_me:$LINENO: checking libstdc++ version" >&5
-@@ -11448,7 +11516,7 @@
-         ;;
-       esac
-     done ;;
--    "default":C) make -s dirs ;;
-+    "default":C) gmake -s dirs ;;
- 
-   esac
- done # for ac_tag
diff --git a/sysutils/apt/files/patch-doc_examples_sources.list b/sysutils/apt/files/patch-doc_examples_sources.list
deleted file mode 100644
index e988da807d76..000000000000
--- a/sysutils/apt/files/patch-doc_examples_sources.list
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/examples/sources.list.orig	Tue Sep 12 03:55:21 2006
-+++ doc/examples/sources.list	Thu Nov  2 13:52:02 2006
-@@ -1,9 +1,7 @@
- # See sources.list(5) for more information, especialy
- # Remember that you can only use http, ftp or file URIs
- # CDROMs are managed through the apt-cdrom tool.
--deb http://http.us.debian.org/debian stable main contrib non-free
--deb http://security.debian.org stable/updates main contrib non-free
-+deb http://www.example.com/packages stable main contrib non-free
- 
- # Uncomment if you want the apt-get source function to work
--#deb-src http://http.us.debian.org/debian stable main contrib non-free
--#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
-+#deb-src http://www.example.com/packages stable main contrib non-free
diff --git a/sysutils/apt/files/patch-dselect_install b/sysutils/apt/files/patch-dselect_install
deleted file mode 100644
index 3c724ec0df28..000000000000
--- a/sysutils/apt/files/patch-dselect_install
+++ /dev/null
@@ -1,17 +0,0 @@
---- dselect/install.orig	Thu Mar  2 05:28:29 2006
-+++ dselect/install	Wed Oct 25 15:17:58 2006
-@@ -3,11 +3,11 @@
- # Set the textdomain for the translations using $"..."
- TEXTDOMAIN="apt"
- 
--# Get the configuration from /etc/apt/apt.conf
-+# Get the configuration from @PREFIX@/etc/apt/apt.conf
- CLEAN="prompt"
- OPTS="-f"
--APTGET="/usr/bin/apt-get"
--DPKG="/usr/bin/dpkg"
-+APTGET="@PREFIX@/bin/apt-get"
-+DPKG="@LOCALBASE@/bin/dpkg"
- DPKG_OPTS="--admindir=$1"
- APT_OPT0="-oDir::State::status=$1/status"
- APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
diff --git a/sysutils/apt/files/patch-dselect_setup b/sysutils/apt/files/patch-dselect_setup
deleted file mode 100644
index b324cbddc3f0..000000000000
--- a/sysutils/apt/files/patch-dselect_setup
+++ /dev/null
@@ -1,11 +0,0 @@
---- dselect/setup.orig	Thu Mar  2 05:33:56 2006
-+++ dselect/setup	Wed Oct 25 15:18:38 2006
-@@ -23,7 +23,7 @@
- my $vardir=$ARGV[0];
- my $method=$ARGV[1];
- my $option=$ARGV[2];
--my $config_file = '/etc/apt/sources.list';
-+my $config_file = '@PREFIX@/etc/apt/sources.list';
- 
- my $boldon=`setterm -bold on`;
- my $boldoff=`setterm -bold off`;
diff --git a/sysutils/apt/files/patch-dselect_update b/sysutils/apt/files/patch-dselect_update
deleted file mode 100644
index 48481eb0bff9..000000000000
--- a/sysutils/apt/files/patch-dselect_update
+++ /dev/null
@@ -1,20 +0,0 @@
---- dselect/update.orig	Thu Mar  2 06:06:31 2006
-+++ dselect/update	Wed Oct 25 15:20:34 2006
-@@ -7,13 +7,13 @@
- # Get the configuration from /etc/apt/apt.conf
- CLEAN="prompt"
- OPTS="-f"
--APTGET="/usr/bin/apt-get"
--APTCACHE="/usr/bin/apt-cache"
--DPKG="/usr/bin/dpkg"
-+APTGET="@PREFIX@/bin/apt-get"
-+APTCACHE="@PREFIX@/bin/apt-cache"
-+DPKG="@LOCALBASE@/bin/dpkg"
- DPKG_OPTS="--admindir=$1"
- APT_OPT0="-oDir::State::status=$1/status"
- APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
--CACHEDIR="/var/cache/apt"
-+CACHEDIR="@APTDIR@/cache"
- PROMPT="false"
- RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::UpdateOptions \
- 		      DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
diff --git a/sysutils/apt/files/patch-ftparchive_cachedb.cc b/sysutils/apt/files/patch-ftparchive_cachedb.cc
deleted file mode 100644
index 0465d54a4d6b..000000000000
--- a/sysutils/apt/files/patch-ftparchive_cachedb.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ftparchive/cachedb.cc.orig	Tue Jul 25 00:35:54 2006
-+++ ftparchive/cachedb.cc	Tue Nov 14 17:06:17 2006
-@@ -25,6 +25,7 @@
- #include <apt-pkg/configuration.h>
-     
- #include <netinet/in.h>       // htonl, etc
-+#include <publib.h>
- 									/*}}}*/
- 
- // CacheDB::ReadyDB - Ready the DB2					/*{{{*/
diff --git a/sysutils/apt/files/patch-ftparchive_contents.cc b/sysutils/apt/files/patch-ftparchive_contents.cc
deleted file mode 100644
index 94a91855eb32..000000000000
--- a/sysutils/apt/files/patch-ftparchive_contents.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ftparchive/contents.cc.orig	Thu Mar  2 06:06:31 2006
-+++ ftparchive/contents.cc	Tue Nov 14 17:13:30 2006
-@@ -41,7 +41,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <malloc.h>    
- 									/*}}}*/
- 
- // GenContents::~GenContents - Free allocated memory			/*{{{*/
diff --git a/sysutils/apt/files/patch-ftparchive_makefile b/sysutils/apt/files/patch-ftparchive_makefile
deleted file mode 100644
index e163f9d30422..000000000000
--- a/sysutils/apt/files/patch-ftparchive_makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ftparchive/makefile.orig	Thu Mar  2 05:45:55 2006
-+++ ftparchive/makefile	Tue Nov 14 17:19:51 2006
-@@ -8,7 +8,7 @@
- # The apt-ftparchive program
- ifdef BDBLIB
- PROGRAM=apt-ftparchive
--SLIBS = -lapt-pkg -lapt-inst $(BDBLIB)
-+SLIBS = -lapt-pkg -lapt-inst -lpub $(BDBLIB)
- LIB_MAKES = apt-pkg/makefile apt-inst/makefile
- SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \
-          multicompress.cc
diff --git a/sysutils/apt/files/patch-methods_gpgv.cc b/sysutils/apt/files/patch-methods_gpgv.cc
deleted file mode 100644
index 11532d927474..000000000000
--- a/sysutils/apt/files/patch-methods_gpgv.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- methods/gpgv.cc.orig	Tue Jul 25 04:19:02 2006
-+++ methods/gpgv.cc	Tue Nov 14 21:18:00 2006
-@@ -52,8 +52,8 @@
-    FILE *pipein;
-    int status;
-    struct stat buff;
--   string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
--   string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg");
-+   string gpgvpath = _config->Find("Dir::Bin::gpg", "@LOCALBASE@/bin/gpgv");
-+   string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "@PREFIX@/etc/apt/trusted.gpg");
-    if (_config->FindB("Debug::Acquire::gpgv", false))
-    {
-       std::cerr << "gpgv path: " << gpgvpath << std::endl;
diff --git a/sysutils/apt/files/patch-methods_makefile b/sysutils/apt/files/patch-methods_makefile
deleted file mode 100644
index 1252a7d98e06..000000000000
--- a/sysutils/apt/files/patch-methods_makefile
+++ /dev/null
@@ -1,82 +0,0 @@
---- methods/makefile.orig	Mon Dec  4 06:37:36 2006
-+++ methods/makefile	Thu Mar 13 17:54:25 2008
-@@ -12,63 +12,70 @@
- 
- # The file method
- PROGRAM=file
--SLIBS = -lapt-pkg 
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = file.cc
- include $(PROGRAM_H)
- 
- # The copy method
- PROGRAM=copy
--SLIBS = -lapt-pkg 
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = copy.cc
- include $(PROGRAM_H)
- 
- # The gzip method
- PROGRAM=gzip
--SLIBS = -lapt-pkg 
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = gzip.cc
- include $(PROGRAM_H)
- 
- # The gpgv method
- PROGRAM=gpgv
--SLIBS = -lapt-pkg
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = gpgv.cc
- include $(PROGRAM_H)
- 
- # The cdrom method
- PROGRAM=cdrom
--SLIBS = -lapt-pkg 
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = cdrom.cc
- include $(PROGRAM_H)
- 
- # The http method
- PROGRAM=http
--SLIBS = -lapt-pkg $(SOCKETLIBS)
-+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = http.cc rfc2553emu.cc connect.cc
- include $(PROGRAM_H)
- 
-+# The https method
-+PROGRAM=https
-+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) -lcurl
-+LIB_MAKES = apt-pkg/makefile
-+SOURCE = https.cc
-+include $(PROGRAM_H)
-+
- # The ftp method
- PROGRAM=ftp
--SLIBS = -lapt-pkg $(SOCKETLIBS)
-+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = ftp.cc rfc2553emu.cc connect.cc
- include $(PROGRAM_H)
- 
- # The rred method
- PROGRAM=rred
--SLIBS = -lapt-pkg $(SOCKETLIBS)
-+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = rred.cc
- include $(PROGRAM_H)
- 
- # The rsh method
- PROGRAM=rsh
--SLIBS = -lapt-pkg
-+SLIBS = -lapt-pkg $(INTLLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = rsh.cc
- include $(PROGRAM_H)
diff --git a/sysutils/apt/pkg-descr b/sysutils/apt/pkg-descr
deleted file mode 100644
index 2365974fe79e..000000000000
--- a/sysutils/apt/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-APT is the Debian project's advanced front-end for dpkg. APT features complete
-installation ordering, multiple source capability and several other unique
-features.
-
-WWW: http://packages.debian.org/apt
diff --git a/sysutils/apt/pkg-plist b/sysutils/apt/pkg-plist
deleted file mode 100644
index 55f834e7750c..000000000000
--- a/sysutils/apt/pkg-plist
+++ /dev/null
@@ -1,120 +0,0 @@
-bin/apt-cache
-bin/apt-cdrom
-bin/apt-config
-bin/apt-extracttemplates
-bin/apt-get
-bin/apt-sortpkgs
-bin/apt-key
-bin/apt-ftparchive
-lib/libapt-inst.so
-lib/libapt-inst.so.1.1
-lib/libapt-inst.so.1.1.0
-lib/libapt-pkg.so
-lib/libapt-pkg.so.3.11
-lib/libapt-pkg.so.3.11.0
-@dir share/apt/keyrings
-libexec/apt/methods/cdrom
-libexec/apt/methods/copy
-libexec/apt/methods/file
-libexec/apt/methods/ftp
-libexec/apt/methods/gpgv
-libexec/apt/methods/gzip
-libexec/apt/methods/http
-libexec/apt/methods/https
-libexec/apt/methods/rred
-libexec/apt/methods/rsh
-libexec/apt/methods/ssh
-libexec/apt/methods/bzip2
-libexec/dpkg/methods/apt/desc.apt
-libexec/dpkg/methods/apt/names
-libexec/dpkg/methods/apt/install
-libexec/dpkg/methods/apt/setup
-libexec/dpkg/methods/apt/update
-include/apt-pkg/mmap.h
-include/apt-pkg/error.h
-include/apt-pkg/configuration.h
-include/apt-pkg/fileutl.h
-include/apt-pkg/cmndline.h
-include/apt-pkg/md5.h
-include/apt-pkg/crc-16.h
-include/apt-pkg/cdromutl.h
-include/apt-pkg/strutl.h
-include/apt-pkg/sptr.h
-include/apt-pkg/sha1.h
-include/apt-pkg/sha256.h
-include/apt-pkg/hashes.h
-include/apt-pkg/algorithms.h
-include/apt-pkg/depcache.h
-include/apt-pkg/pkgcachegen.h
-include/apt-pkg/cacheiterators.h
-include/apt-pkg/orderlist.h
-include/apt-pkg/sourcelist.h
-include/apt-pkg/packagemanager.h
-include/apt-pkg/tagfile.h
-include/apt-pkg/init.h
-include/apt-pkg/pkgcache.h
-include/apt-pkg/version.h
-include/apt-pkg/progress.h
-include/apt-pkg/pkgrecords.h
-include/apt-pkg/acquire.h
-include/apt-pkg/acquire-worker.h
-include/apt-pkg/acquire-item.h
-include/apt-pkg/acquire-method.h
-include/apt-pkg/clean.h
-include/apt-pkg/srcrecords.h
-include/apt-pkg/cachefile.h
-include/apt-pkg/versionmatch.h
-include/apt-pkg/policy.h
-include/apt-pkg/pkgsystem.h
-include/apt-pkg/indexfile.h
-include/apt-pkg/metaindex.h
-include/apt-pkg/indexrecords.h
-include/apt-pkg/vendor.h
-include/apt-pkg/vendorlist.h
-include/apt-pkg/cdrom.h
-include/apt-pkg/indexcopy.h
-include/apt-pkg/debversion.h
-include/apt-pkg/debsrcrecords.h
-include/apt-pkg/dpkgpm.h
-include/apt-pkg/debrecords.h
-include/apt-pkg/deblistparser.h
-include/apt-pkg/debsystem.h
-include/apt-pkg/debindexfile.h
-include/apt-pkg/debmetaindex.h
-include/apt-pkg/extracttar.h
-include/apt-pkg/arfile.h
-include/apt-pkg/filelist.h
-include/apt-pkg/database.h
-include/apt-pkg/extract.h
-include/apt-pkg/dpkgdb.h
-include/apt-pkg/dirstream.h
-include/apt-pkg/debfile.h
-man/man1/apt-extracttemplates.1.gz
-man/man1/apt-ftparchive.1.gz
-man/man1/apt-sortpkgs.1.gz
-man/man5/apt.conf.5.gz
-man/man5/apt_preferences.5.gz
-man/man5/sources.list.5.gz
-man/man8/apt-cache.8.gz
-man/man8/apt-cdrom.8.gz
-man/man8/apt-config.8.gz
-man/man8/apt-get.8.gz
-man/man8/apt-key.8.gz
-man/man8/apt-secure.8.gz
-@dir etc/apt/conf.d
-@sample etc/apt/sources.list.sample
-@sample etc/apt/apt.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
-%%PORTDOCS%%%%DOCSDIR%%/README.progress-reporting
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apt.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sources.list
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configure-index
-@dir /%%APTDIR%%/cache/archives/partial
-@dir /%%APTDIR%%/cache/archives
-@dir /%%APTDIR%%/cache
-@dir /%%APTDIR%%/state/lists/partial
-@dir /%%APTDIR%%/state/lists
-@dir /%%APTDIR%%/state
-@dir /%%APTDIR%%