Remove expired ports:

2018-08-20 net/openmq: Broken for more than 5 months 2018-08-20 net/coda6_server: Broken for more than 5 months 2018-08-20 net/ceph-devel: Broken for more than 5 months 2018-08-20 java/jgrapht: Broken for more than 5 months 2018-08-20 mail/mutt14: mutt 1.4.x has been out of support for 10+ years use mail/mutt 2018-08-20 www/pydio: Broken for more than 5 months 2018-08-20 security/fastd-devel: Broken for more than 5 months 2018-08-20 security/fastd: Broken for more than 5 months 2018-08-20 devel/bhyve-vm-goagent: Broken for more than 5 months 2018-08-20 devel/cherivis-devel: Depends on broken and expiring cheritrace-devel 2018-08-20 devel/cheritrace-devel: Broken for more than 5 months 2018-08-20 devel/javolution: Broken for more than 5 months 2018-08-20 devel/bisoncpp: Depends on broken and expiring libbobcat 2018-08-20 databases/php5-pdo_cassandra: Broken for more than 5 months 2018-08-20 games/crafty-open-large: Broken for more than 5 months 2018-08-20 games/crafty-open-enormous: Broken for more than 5 months 2018-08-20 games/crafty-open-medium: Broken for more than 5 months 2018-08-20 math/jakarta-commons-math: Broken for more than 5 months 2018-08-20 math/hfst: Broken for more than 5 months 2018-08-20 math/octave-forge-communications: Broken for more than 5 months 2018-08-20 lang/v8-devel: Broken for more than 5 months 2018-08-20 sysutils/rubygem-fluentd010: Broken for more than 5 months
2018-08-21 12:06:54 +00:00
parent 8950e0e969
commit 7526a10e45
166 changed files with 22 additions and 16864 deletions
@@ -10463,3 +10463,25 @@ sysutils/areca-cli||2018-08-16|Has expired: unknown license
 net-im/tox12|net-im/tox|2018-08-18|Unused
 www/moodle32|www/moodle33|2018-08-19|Has expired: Deprecated by upstream
 archivers/opkg|archivers/opkg-openwrt|2018-08-20|Better naming
+net/openmq||2018-08-21|Has expired: Broken for more than 5 months
+net/coda6_server||2018-08-21|Has expired: Broken for more than 5 months
+net/ceph-devel||2018-08-21|Has expired: Broken for more than 5 months
+java/jgrapht||2018-08-21|Has expired: Broken for more than 5 months
+mail/mutt14||2018-08-21|Has expired: mutt 1.4.x has been out of support for 10+ years use mail/mutt
+www/pydio||2018-08-21|Has expired: Broken for more than 5 months
+security/fastd-devel||2018-08-21|Has expired: Broken for more than 5 months
+security/fastd||2018-08-21|Has expired: Broken for more than 5 months
+devel/bhyve-vm-goagent||2018-08-21|Has expired: Broken for more than 5 months
+devel/cherivis-devel||2018-08-21|Has expired: Depends on broken and expiring cheritrace-devel
+devel/cheritrace-devel||2018-08-21|Has expired: Broken for more than 5 months
+devel/javolution||2018-08-21|Has expired: Broken for more than 5 months
+devel/bisoncpp||2018-08-21|Has expired: Depends on broken and expiring libbobcat
+databases/php5-pdo_cassandra||2018-08-21|Has expired: Broken for more than 5 months
+games/crafty-open-large||2018-08-21|Has expired: Broken for more than 5 months
+games/crafty-open-enormous||2018-08-21|Has expired: Broken for more than 5 months
+games/crafty-open-medium||2018-08-21|Has expired: Broken for more than 5 months
+math/jakarta-commons-math||2018-08-21|Has expired: Broken for more than 5 months
+math/hfst||2018-08-21|Has expired: Broken for more than 5 months
+math/octave-forge-communications||2018-08-21|Has expired: Broken for more than 5 months
+lang/v8-devel||2018-08-21|Has expired: Broken for more than 5 months
+sysutils/rubygem-fluentd010||2018-08-21|Has expired: Broken for more than 5 months
@@ -622,7 +622,6 @@
    SUBDIR += php-mdcached
    SUBDIR += php-memcache
    SUBDIR += php-xapian
-    SUBDIR += php5-pdo_cassandra
    SUBDIR += php5-tarantool
    SUBDIR += php56-dba
    SUBDIR += php56-interbase
@@ -1,52 +0,0 @@
-# Created by: Gasol Wu <gasol.wu@gmail.com>
-# $FreeBSD$
-
-PORTNAME=	pdo_cassandra
-PORTVERSION=	0.2.1
-PORTREVISION=	17
-CATEGORIES=	databases
-PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
-
-MAINTAINER=	gasol.wu@gmail.com
-COMMENT=	PDO driver for Apache Cassandra
-
-LICENSE=	APACHE20
-
-BROKEN=		fails to build
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
-BROKEN_powerpc64=	Does not build
-
-LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	mkoppanen
-GH_PROJECT=	php-${PORTNAME}
-GH_TAGNAME=	7debd5b
-
-USES=		compiler:c++11-lib php:ext pkgconfig
-USE_CXXSTD=	c++11
-USE_PHP=	pdo:build
-
-IGNORE_WITH_PHP=	70 71 72
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/thrift/bsd.thrift.mk"
-
-THRIFT_MAJOR_VER=	${THRIFT_PORTVERSION:R:R}
-THRIFT_MINOR_VER=	${THRIFT_PORTVERSION:R:E}
-THRIFT_PATCH_VER=	${THRIFT_PORTVERSION:E}
-
-.if ${THRIFT_MAJOR_VER} >= 0 || ${THRIFT_MINOR_VER} >= 9 || ${THRIFT_PATCH_VER} >= 1
-LIB_DEPENDS+=	libthrift.so:devel/thrift-cpp
-BUILD_DEPENDS+=	${LOCALBASE}/bin/thrift:devel/thrift
-.else
-LIB_DEPENDS+=	libthrift.so:devel/thrift
-.endif
-
-post-configure:
-	${REINPLACE_CMD} 's/\([^:]\)apache::thrift/\1 ::apache::thrift/g' ${WRKSRC}/gen-cpp/Cassandra.cpp
-	${REINPLACE_CMD} 's/\([^:]\)apache::thrift/\1 ::apache::thrift/g' ${WRKSRC}/gen-cpp/Cassandra.h
-	${REINPLACE_CMD} 's/\([^:]\)apache::thrift/\1 ::apache::thrift/g' ${WRKSRC}/gen-cpp/cassandra_types.cpp
-
-.include <bsd.port.post.mk>
@@ -1,2 +0,0 @@
-SHA256 (mkoppanen-php-pdo_cassandra-0.2.1-7debd5b_GH0.tar.gz) = 9814535af2fe99f706af50947e6cff26a940de87246a42d89bd4fd48ac76d06c
-SIZE (mkoppanen-php-pdo_cassandra-0.2.1-7debd5b_GH0.tar.gz) = 32961
@@ -1,22 +0,0 @@
--- config.m4.orig	2011-12-30 09:41:22 UTC
-+++ config.m4
-@@ -38,8 +38,18 @@ if test "x${PHP_PDO_CASSANDRA}" != "xno"
-     PHP_THRIFT_VERSION=`${PKG_CONFIG} thrift --modversion`
- 
-     AC_MSG_RESULT([found version ${PHP_THRIFT_VERSION}])
-+    ac_IFS=$IFS
-+    IFS="."
-+    set $PHP_THRIFT_VERSION
-+    IFS=$ac_IFS
-+    dnl workaround for changes of THRIFT-1968
-+    THRIFT_VERSION=`expr [$]1 \* 10000 + [$]2 \* 100 + [$]3`
-+    if test "$THRIFT_VERSION" -ge "901"; then
-+      PHP_THRIFT_INCS="-I`${PKG_CONFIG} thrift --variable=includedir`/thrift"
-+    else
-+      PHP_THRIFT_INCS=`${PKG_CONFIG} thrift --cflags`
-+    fi
-     PHP_THRIFT_LIBS=`${PKG_CONFIG} thrift --libs`
-    PHP_THRIFT_INCS=`${PKG_CONFIG} thrift --cflags`
- 
-     PHP_EVAL_LIBLINE(${PHP_THRIFT_LIBS}, PDO_CASSANDRA_SHARED_LIBADD)
-     PHP_EVAL_INCLINE(${PHP_THRIFT_INCS})
@@ -1,10 +0,0 @@
-PDO driver for Apache Cassandra
-
-Cassandra is a highly scalable, eventually consistent, distributed,
-structured key-value store. Cassandra brings together the distributed
-systems technologies from Dynamo and the data model from Google's
-BigTable. Like Dynamo, Cassandra is eventually consistent. Like
-BigTable, Cassandra provides a ColumnFamily-based data model richer
-than typical key/value systems.
-
-WWW: http://code.google.com/a/apache-extras.org/p/cassandra-pdo/
@@ -200,14 +200,12 @@
    SUBDIR += bennugd-core
    SUBDIR += bennugd-modules
    SUBDIR += bglibs
-    SUBDIR += bhyve-vm-goagent
    SUBDIR += bicyclerepair
    SUBDIR += bin86
    SUBDIR += binaryen
    SUBDIR += bingrep
    SUBDIR += binutils
    SUBDIR += bison
-    SUBDIR += bisoncpp
    SUBDIR += blame
    SUBDIR += blitz
    SUBDIR += bmake
@@ -287,8 +285,6 @@
    SUBDIR += check
    SUBDIR += checkbashisms
    SUBDIR += checkheaders
-    SUBDIR += cheritrace-devel
-    SUBDIR += cherivis-devel
    SUBDIR += chromium-gn
    SUBDIR += chrpath
    SUBDIR += chruby
@@ -1255,7 +1251,6 @@
    SUBDIR += jam
    SUBDIR += jansson
    SUBDIR += java-findbugs
-    SUBDIR += javolution
    SUBDIR += jclassinfo
    SUBDIR += jcmdline
    SUBDIR += jech-dht
@@ -1,43 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	bhyve-vm-goagent
-PORTVERSION=	1.0
-DISTVERSIONPREFIX=	v
-PORTREVISION=	4
-CATEGORIES=	devel sysutils
-
-MAINTAINER=	araujo@FreeBSD.org
-COMMENT=	Agent developed in Go that runs inside guest vm
-
-LICENSE=	BSD2CLAUSE
-
-BROKEN=		attempts to download dependencies during build
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
-
-ONLY_FOR_ARCHS=	amd64 i386
-
-BUILD_DEPENDS=	git:devel/git
-
-USES=		go
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	freenas
-GH_TAGNAME=	a640870c90752e01af30e394ce7c8157f4371a1b
-GH_TUPLE=	gorilla:websocket:v1.2.0:websocket/src/github.com/gorilla/websocket \
-		shirou:gopsutil:v2.17.12:gopsutil/src/github.com/shirou/gopsutil
-
-MAKE_ENV=	GOPATH=${WRKSRC} GOROOT=${LOCALBASE}/go
-
-PLIST_FILES=	sbin/bhyve-vm-goagent
-
-do-build:
-	cd ${WRKSRC} ; make deps ; make build
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-freebsd-${ARCH}-1.0-RELEASE \
-		${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
-
-.include <bsd.port.mk>
@@ -1,7 +0,0 @@
-TIMESTAMP = 1520447374
-SHA256 (freenas-bhyve-vm-goagent-v1.0-a640870c90752e01af30e394ce7c8157f4371a1b_GH0.tar.gz) = 71ff3e116f6a4298ec683154b6deadad22d0bc7e1e9541c2f765991714d7ba15
-SIZE (freenas-bhyve-vm-goagent-v1.0-a640870c90752e01af30e394ce7c8157f4371a1b_GH0.tar.gz) = 7262
-SHA256 (gorilla-websocket-v1.2.0_GH0.tar.gz) = 04d1c4fa839a01d32d3c8c558370a964d83b5c980f74c4b965f3dd04f8cb9276
-SIZE (gorilla-websocket-v1.2.0_GH0.tar.gz) = 42984
-SHA256 (shirou-gopsutil-v2.17.12_GH0.tar.gz) = 0abdee29c3c70d9860d8177e70b9bbb0651af4e48b03cfbb36bdf53300fa7268
-SIZE (shirou-gopsutil-v2.17.12_GH0.tar.gz) = 107887
@@ -1,23 +0,0 @@
--- Makefile.orig	2018-01-29 12:30:37 UTC
-+++ Makefile
-@@ -1,6 +1,6 @@
- GO ?= go
- TARGET := bhyve-vm-goagent
-OS := freebsd netbsd linux windows
-+OS := freebsd
- ARCH := 386 amd64
- VERSION := `grep \"VERSION\" main.go | cut -d '"' -f 2 | head -1`
- 
-@@ -9,10 +9,8 @@ all: build
- deps:
- 	@echo "===> Downloading crossbuild dependencies."
- 	go get github.com/gorilla/websocket
-	go get github.com/shirou/w32
-	go get github.com/StackExchange/wmi
-	go get github.com/go-ole/go-ole
-	go get github.com/go-ole/go-ole/oleutil
-+	go get github.com/araujobsd/bhyve-vm-goagent/plugins
-+	go get github.com/araujobsd/bhyve-vm-goagent/termios
- 
- build:
- 	@for os in $(OS); do \
@@ -1,7 +0,0 @@
-It is an agent developed using Go that runs inside guest virtual machines
-and allows host hypervisor to obtain information from guest such like
-memory usage, cpu, disk and ethernet configuration.
-
-It supports virtio-console as well as WebSocket protocol.
-
-WWW: https://github.com/freenas/bhyve-vm-goagent
@@ -1,72 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	bisoncpp
-PORTVERSION=	4.10.01
-PORTREVISION=	4
-CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/bisonc%2B%2B/${PORTVERSION}
-DISTNAME=	bisonc++_${PORTVERSION}.orig
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	LALR(1) parser generator that generates C++ classes
-
-LICENSE=	GPLv3
-
-DEPRECATED=	Depends on broken and expiring libbobcat
-EXPIRATION_DATE=	2018-08-20
-
-BUILD_DEPENDS=	icmake:devel/icmake \
-		yodl>=3.0:textproc/yodl \
-		libbobcat>=3.18:devel/libbobcat
-
-DOCSDIR=	${PREFIX}/share/doc/bisonc++
-PORTDOCS=	*
-
-WRKSRC=		${WRKDIR}/bisonc++-${PORTVERSION}
-
-USE_GCC=	yes
-
-USES=		shebangfix
-
-SHEBANG_LANG=	icmake
-icmake_OLD_CMD=	/usr/bin/icmake
-icmake_CMD=	${LOCALBASE}/bin/icmake
-
-SHEBANG_FILES=	build \
-		documentation/examples/bison++Example.NEW/make \
-		documentation/man/calculator/build \
-		documentation/manual/examples/calc/build \
-		documentation/manual/examples/errorcalc/build \
-		documentation/manual/examples/mfcalc/build \
-		documentation/manual/examples/rpn/build \
-		documentation/manual/grammar/poly/build \
-		documentation/regression/run \
-		parser/driver/build \
-		scanner/driver/build
-
-post-patch:
-	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/INSTALL.im
-	@${REINPLACE_CMD} 's|"g++|"${CXX}|' \
-		${WRKSRC}/INSTALL.im \
-		${WRKSRC}/scanner/driver/build \
-		${WRKSRC}/parser/driver/build
-	@${REINPLACE_CMD} 's|"gcc|"${CC}|' \
-		${WRKSRC}/icmake/special
-	@${REINPLACE_CMD} 's|"cp -d |"cp -Pp | ; \
-		s|"cp -r |"cp -R | ; \
-		s|-doc|/doc|' \
-		${WRKSRC}/icmake/install
-
-do-build:
-	@cd ${WRKSRC} && ./build program strip
-	@cd ${WRKSRC} && ./build man
-	@cd ${WRKSRC} && ./build manual
-
-do-install:
-	cd ${WRKSRC} && ./build install program ${STAGEDIR}
-	cd ${WRKSRC} && ./build install man ${STAGEDIR}
-	cd ${WRKSRC} && ./build install manual ${STAGEDIR}
-	cd ${WRKSRC} && ./build install skel ${STAGEDIR}
-
-.include <bsd.port.mk>
@@ -1,2 +0,0 @@
-SHA256 (bisonc++_4.10.01.orig.tar.gz) = d03b1c3982f7cff9663382cb6933ccc5aa8ce35a7ccbd6f76769aa261777bf0b
-SIZE (bisonc++_4.10.01.orig.tar.gz) = 652569
@@ -1,36 +0,0 @@
--- INSTALL.im.orig	2015-04-28 13:26:33 UTC
-+++ INSTALL.im
-@@ -15,7 +15,7 @@
- #define LDFLAGS             ""
-     // flags passed to the linker
- 
-#define SKEL    "/usr/share/bisonc++"
-+#define SKEL    "%%PREFIX%%/share/"${PROGRAM}
-     // the directory where the skeleton files are installed
-     // Recompile options/data.cc if the skeleton location changes
- 
-@@ -23,19 +23,19 @@
- // =========================================================================
- // The following locations are overruled by `build' arguments
- 
-#define BINARY     "/usr/bin/"${PROGRAM}
-+#define BINARY     "%%PREFIX%%/bin/"${PROGRAM}
-     // the full path of the final program
- 
-#define MAN     "/usr/share/man/man1"
-+#define MAN     "%%PREFIX%%/man/man1"
-     // the directory whre the manual page is stored
- 
-#define MANUAL   "/usr/share/doc/"${PROGRAM}"-doc/manual"
-+#define MANUAL   "%%PREFIX%%/share/doc/"${PROGRAM}"/manual"
-     // the directory whre the manual page is stored
- 
-#define STD     "/usr/share/doc/"${PROGRAM}
-+#define STD     "%%PREFIX%%/share/doc/"${PROGRAM}
-     // the directory where the standard documentation is stored 
- 
-#define EXTRA   "/usr/share/doc/"${PROGRAM}"-doc"
-+#define EXTRA   "%%PREFIX%%/share/doc/"${PROGRAM}
-     // the directory where the extra documentation is stored 
- 
- 
@@ -1,11 +0,0 @@
--- block/atindex.cc.orig	2013-06-23 18:13:49 UTC
-+++ block/atindex.cc
-@@ -6,7 +6,7 @@ void Block::atIndex(size_t lineNr, strin
-     d_atDollar.push_back(
-         AtDollar(
-             AtDollar::AT, length(), lineNr, 
-            text, stol(text.substr(1)), false
-+            text, A2x(text.substr(1)), false
-         )
-     );
-     append(text);
@@ -1,12 +0,0 @@
--- block/block.ih.orig	2013-06-23 18:13:49 UTC
-+++ block/block.ih
-@@ -5,6 +5,8 @@
- #include <iterator>
- #include <limits>
- 
-using namespace std;
-+#include <bobcat/a2x>
- 
-+using namespace std;
-+using namespace FBB;
- 
@@ -1,11 +0,0 @@
--- block/dollarindex.cc.orig	2013-06-23 18:13:49 UTC
-+++ block/dollarindex.cc
-@@ -6,7 +6,7 @@ void Block::dollarIndex(size_t lineNr, s
- {
-     d_atDollar.push_back(
-         AtDollar(AtDollar::DOLLAR, length(), lineNr, 
-                 text, stol(text.substr(1)), member)
-+                 text, A2x(text.substr(1)), member)
-     );
-     append(text);
- }
@@ -1,11 +0,0 @@
--- block/idindex.cc.orig	2013-06-23 18:13:49 UTC
-+++ block/idindex.cc
-@@ -8,7 +8,7 @@ void Block::IDindex(size_t lineNr, strin
-     d_atDollar.push_back(
-         AtDollar(
-             AtDollar::DOLLAR, length(), lineNr, 
-            text, text.substr(begin, end - begin), stol(text.substr(end + 1))
-+            text, text.substr(begin, end - begin), A2x(text.substr(end + 1))
-         )
-     );
- 
@@ -1,13 +0,0 @@
--- build.orig	2015-05-25 15:47:08 UTC
-+++ build
-@@ -40,7 +40,10 @@ void main(int argc, list argv)
-         manpage();
- 
-     if (option == "manual")
-+    {
-+        manhtmlpage();
-         manual();
-+    }
- 
-     if (option == "library")
-     {
@@ -1,12 +0,0 @@
--- documentation/manual/conditions/gpl.yo.orig	2012-02-08 19:53:51 UTC
-+++ documentation/manual/conditions/gpl.yo
-@@ -1,8 +1,2 @@
- The text of the em(GNU General Public License) (GPL) is frequently found in
-files named tt(COPYING). On em(Debian) systems the GPL may be found in the
-file tt(/usr/share/common-licenses/GPL).
-
-The GPL is shown below:
-
-verbinclude(/usr/share/common-licenses/GPL)
-
-+files named tt(COPYING).
@@ -1,11 +0,0 @@
--- documentation/manual/invoking/options.yo.orig	2015-04-28 13:26:33 UTC
-+++ documentation/manual/invoking/options.yo
-@@ -235,7 +235,7 @@ END)
- 
-     it() loption(own-tokens) (soption(T))nl()
-            The tokens returned as well as the text matched when bic() reads
-            its input files(s) are shown when this option is used.
-+            its input file(s) are shown when this option is used.
- 
-            This option does em(not) result in the generated parsing function
-             displaying returned tokens and matched text. If that is what you
@@ -1,91 +0,0 @@
--- icmake/install.orig	2013-06-21 09:16:34 UTC
-+++ icmake/install
-@@ -3,7 +3,6 @@ string setWhere(string where, string def
-     if (where == "")
-         where = defaultWhere;
- 
-    md(where);
-     return where;
- }
- 
-@@ -13,22 +12,15 @@ void install(string what, string where)
- 
-     if (what == "program")
-     {
-        if (where == "")
-            where = BINARY;
-
-        path = get_path(where);
-        if (path != "")
-            md(path);
-
-+        where = setWhere(where + BINARY, BINARY);
-         printf("  INSTALLING the executable `", where, "'\n");
-        run("icmbuild install program " + where);
-+        run("cp tmp/bin/* " + where);
-         exit(0);
-     }
- 
-     if (what == "skel")
-     {
-        where = setWhere(where, SKEL);
-
-+        where = setWhere(where + SKEL, SKEL);
-         printf("  INSTALLING skeleton files at `" + where + "'\n");
-         md(where);
-         run("cp skeletons/* " + where);
-@@ -37,8 +29,7 @@ void install(string what, string where)
- 
-     if (what == "man")
-     {
-        where = setWhere(where, MAN);
-
-+        where = setWhere(where + MAN, MAN);
-         printf("  INSTALLING the manual page at `", where, "'\n");
-         run("gzip -9 < tmp/man/" PROGRAM ".1 > " + where + "/" PROGRAM ".1.gz");
-         exit(0);
-@@ -46,21 +37,18 @@ void install(string what, string where)
- 
-     if (what == "manual")
-     {
-        where = setWhere(where, MANUAL);
-
-+        where = setWhere(where + MANUAL, MANUAL);
-         printf("  INSTALLING the manual at `", where, "'\n");
-        run("cp -r tmp/manual " + where);
-
-+        md(where);
-+        run("cp -r tmp/manual/* " + where);
-         exit(0);
-     }
- 
-     if (what == "std")
-     {
-        where = setWhere(where, STD);
-
-+        where = setWhere(where + STD, STD);
-         printf("  INSTALLING the changelog at `", where, "\n");
-         run("gzip -9 < changelog > " + where + "/changelog.gz");
-    
-         printf("  INSTALLING the html-manual page at `", where, "\n");
-         run("cp tmp/manhtml/" PROGRAM "man.html " + where);
-         exit(0);
-@@ -68,17 +56,14 @@ void install(string what, string where)
- 
-     if (what == "extra")
-     {
-        where = setWhere(where, EXTRA);
-
-+        where = setWhere(where + EXTRA, EXTRA);
-         printf("  INSTALLING original bison's docs at `", where + "'\n");
-         md(where + "/bison-docs");
-         run("cp -r documentation/html "
-                   "documentation/bison.ps.org " + where + "/bison-docs");
-
-         printf("  INSTALLING examples at `", where + "'\n");
-         run("cp -r documentation/examples " + where);
-         run("cp -r documentation/man/calculator " + where + "/examples");
-
-         printf("  INSTALLING regression tests at `", where + "'\n");
-         run("cp -r documentation/regression " + where);
-         exit(0);
@@ -1,35 +0,0 @@
--- icmake/manpage.orig	2013-06-21 09:16:34 UTC
-+++ icmake/manpage
-@@ -3,14 +3,29 @@
- 
- void manpage()
- {
-    md("tmp/man tmp/manhtml");
-+    md("tmp/man");
- 
-     chdir("documentation/man");
- 
-     if (PROGRAM ".yo" younger MANPAGE || "release.yo" younger MANPAGE)
-     {
-        run("yodl2man  -o " MANPAGE " "  PROGRAM);
-        run("yodl2html  -o " MANHTML " " PROGRAM);
-+        run("yodl2man -l3 -o " MANPAGE " " PROGRAM);
-     }
-     exit(0);
- }
-+
-+void manhtmlpage()
-+{
-+    md("tmp/manhtml");
-+
-+    special();
-+
-+    chdir("documentation/man");
-+
-+    if (PROGRAM ".yo" younger MANHTML || "release.yo" younger MANHTML)
-+    {
-+        run("yodl2html -l3 -o " MANHTML " " PROGRAM);
-+    }
-+
-+    chdir("../..");
-+}
@@ -1,10 +0,0 @@
--- options/options.ih.orig	2013-06-21 09:16:34 UTC
-+++ options/options.ih
-@@ -4,6 +4,7 @@
- #include <bobcat/arg>
- #include <bobcat/string>
- #include <bobcat/mstream>
-+#include <bobcat/a2x>
- 
- using namespace std;
- using namespace FBB;
@@ -1,11 +0,0 @@
--- options/setbasicstrings.cc.orig	2014-02-17 12:30:08 UTC
-+++ options/setbasicstrings.cc
-@@ -34,7 +34,7 @@ void Options::setBasicStrings()
- 
-     string nTokens;
-     if (d_arg.option(&nTokens, "required-tokens"))
-        d_requiredTokens = stoul(nTokens);
-+        d_requiredTokens = A2x(nTokens);
-     
-     d_arg.option(&d_genericFilename, 'f');
-     if (d_genericFilename.empty())
@@ -1,11 +0,0 @@
--- scanner/lex.cc.orig	2015-05-17 14:35:38 UTC
-+++ scanner/lex.cc
-@@ -2698,7 +2698,7 @@ try
-         {
- #line 194 "lexer"
-             {
-                d_number = stoul(d_matched);
-+                d_number = A2x(d_matched);
-                 return Parser::NUMBER;
-             }
-         }
@@ -1,10 +0,0 @@
--- scanner/scanner.ih.orig	2013-06-23 18:13:49 UTC
-+++ scanner/scanner.ih
-@@ -14,6 +14,7 @@
- #include <bobcat/arg>
- #include <bobcat/mstream>
- #include <bobcat/string>
-+#include <bobcat/a2x>
- 
- #include "../parser/parserbase.h"   
- #include "../options/options.h"
@@ -1,11 +0,0 @@
--- scanner/scanner1.cc.orig	2013-06-23 18:13:49 UTC
-+++ scanner/scanner1.cc
-@@ -15,7 +15,7 @@ Scanner::Scanner(std::string const &infi
- 
-     string value;
-     if (arg.option(&value, "max-inclusion-depth"))
-        d_maxDepth = stoul(value);
-+        d_maxDepth = A2x(value);
-     else
-         d_maxDepth = 10;
- }
@@ -1,6 +0,0 @@
-The program bisonc++ creates a C++ parser function and -class having a
-cleaner setup than the code generated by Alain Coetmeur's bison++.
-Furthermore, since bisonc++ more closely follows current-day ideas about
-C++ programming its code is easier to read.
-
-WWW: http://bisoncpp.sourceforge.net/
@@ -1,19 +0,0 @@
-bin/bisonc++
-man/man1/bisonc++.1.gz
-share/bisonc++/bisonc++.cc
-share/bisonc++/bisonc++.h
-share/bisonc++/bisonc++.ih
-share/bisonc++/bisonc++base.h
-share/bisonc++/bisonc++polymorphic
-share/bisonc++/bisonc++polymorphic.inline
-share/bisonc++/debugdecl.in
-share/bisonc++/debugfunctions1.in
-share/bisonc++/debugfunctions2.in
-share/bisonc++/debugfunctions3.in
-share/bisonc++/debugincludes.in
-share/bisonc++/debuglookup.in
-share/bisonc++/lex.in
-share/bisonc++/ltype.in
-share/bisonc++/ltypedata.in
-share/bisonc++/print.in
-share/bisonc++/threading.in
@@ -1,27 +0,0 @@
-# Created by: David Chisnall <theraven@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	cheritrace
-PORTVERSION=	0.0.1
-PORTREVISION=	3
-CATEGORIES=	devel security
-
-MAINTAINER=	theraven@FreeBSD.org
-COMMENT=	Library and tool for interacting with CHERI streamtraces
-
-BROKEN=		fails to build: cheritrace-0.0.1_2 depends on shared library: libLLVMCore.so - not found
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
-BROKEN_powerpc64=	fails to compile: addressmap.cc: 'stoll' is not a member of 'std'
-
-BUILD_DEPENDS=	llvm-config-cheri:devel/llvm-cheri
-LIB_DEPENDS=	libLLVMCore.so:devel/llvm-cheri
-
-USES=		cmake compiler:c++11-lib
-USE_GITHUB=	yes
-GH_ACCOUNT=	CTSRD-CHERI
-GH_TAGNAME=	a7ddf11
-
-CMAKE_ARGS=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config-cheri
-
-.include <bsd.port.mk>
@@ -1,2 +0,0 @@
-SHA256 (CTSRD-CHERI-cheritrace-0.0.1-a7ddf11_GH0.tar.gz) = c85467fdadd8ac70f54cf8187421cce1e79697c26e2645e68ce7113482f790cb
-SIZE (CTSRD-CHERI-cheritrace-0.0.1-a7ddf11_GH0.tar.gz) = 86733
@@ -1,3 +0,0 @@
-Library and associated tool for reading streamtraces for the CHERI processor.
-
-WWW: https://github.com/CTSRD-CHERI/cheritrace
@@ -1,9 +0,0 @@
-include/cheritrace/addressmap.hh
-include/cheritrace/cheri.hh
-include/cheritrace/cheritrace.hh
-include/cheritrace/disassembler.hh
-include/cheritrace/objectfile.hh
-include/cheritrace/streamtrace.hh
-lib/libcheritrace.a
-lib/libcheritrace.so
-bin/cheri-tracedump
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	cherivis-devel
-PORTVERSION=	0.4
-DISTVERSIONPREFIX=	v
-PORTREVISION=	2
-CATEGORIES=	devel gnustep
-
-MAINTAINER=	theraven@FreeBSD.org
-COMMENT=	Visualisation tool for CHERI / BERI streamtraces
-
-LICENSE=	MIT
-
-DEPRECATED=	Depends on broken and expiring cheritrace-devel
-EXPIRATION_DATE=	2018-08-20
-BROKEN_aarch64=		does not compile: error: unexpected token in argument list
-
-USES=		gnustep
-USE_GITHUB=	yes
-GH_ACCOUNT=	CTSRD-CHERI
-GH_PROJECT=	CheriVis
-
-LIB_DEPENDS+=	libcheritrace.so:devel/cheritrace-devel
-
-USE_GNUSTEP=		back build
-USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
-
-.include <bsd.port.mk>
@@ -1,3 +0,0 @@
-TIMESTAMP = 1464769956
-SHA256 (CTSRD-CHERI-CheriVis-v0.4_GH0.tar.gz) = 507539f335e8ec7f4fb4127ad179cb200c50e28664d0d4d27991431cee5f9ebe
-SIZE (CTSRD-CHERI-CheriVis-v0.4_GH0.tar.gz) = 519445
@@ -1,5 +0,0 @@
-A tool for viewing streamtraces from the BERI and CHERI processors from SRI
-International and the University of Cambridge.  CheriVis uses LLVM to read
-object code and to disassemble MIPS instructions.
-
-WWW: https://github.com/CTSRD-CHERI/CheriVis
@@ -1,8 +0,0 @@
-GNUstep/System/Applications/CheriVis.app/CheriVis
-GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.desktop
-GNUstep/System/Applications/CheriVis.app/Resources/CheriVis.tiff
-GNUstep/System/Applications/CheriVis.app/Resources/Document.xib
-GNUstep/System/Applications/CheriVis.app/Resources/Info-gnustep.plist
-GNUstep/System/Applications/CheriVis.app/Resources/MainMenu.xib
-GNUstep/System/Applications/CheriVis.app/stamp.make
-GNUstep/System/Tools/CheriVis
@@ -1,54 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	javolution
-PORTVERSION=	5.5.1
-CATEGORIES=	devel java
-MASTER_SITES=	LOCAL/ale
-
-MAINTAINER=	ale@FreeBSD.org
-COMMENT=	Java solution for real time and embedded systems
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-BROKEN=		fails to build
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
-
-USE_JAVA=	yes
-JAVA_VERSION=	1.6
-USE_ANT=	yes
-ALL_TARGET=	1.6
-
-PORTDOCS=	*
-
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} "s|doc, jar, _zip|doc, jar|" ${WRKSRC}/build.xml
-.else
-	@${REINPLACE_CMD} "s|doc, jar, _zip|jar|" ${WRKSRC}/build.xml
-.endif
-
-do-install:
-	@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-${PORTVERSION}.jar \
-		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
-	@${ECHO_MSG} " [DONE]"
-.if ${PORT_OPTIONS:MDOCS}
-	@${ECHO_MSG} -n ">> Installing documentation..."
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} && ${FIND} index.html css \
-	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
-	@cd ${WRKSRC}/target/site && ${FIND} apidocs \
-	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
-	@${ECHO_MSG} " [DONE]"
-.endif
-
-.include <bsd.port.mk>
@@ -1,2 +0,0 @@
-SHA256 (javolution-5.5.1.tar.gz) = 171c4c479f34bee7b8c12efb0741864cc7fce02705ab84a2c61c2e44ee51b7c4
-SIZE (javolution-5.5.1.tar.gz) = 435340
@@ -1,20 +0,0 @@
-Javolution is the Java solution for real-time and embedded systems.
-Javolution real-time goals are simple: to make your application
-faster and more time predictable!
-
-That being accomplished through:
- * High performance and time-deterministic (real-time)
-   util / lang / text / io / xml base classes.
- * Context programming in order to achieve true separation of
-   concerns (logging, performance, etc).
- * A testing framework addressing not only unit tests but also
-   performance and regression tests as well.
- * Straightforward and low-level parallel computing capabilities
-   with ConcurrentContext.
- * Struct and Union base classes for direct interfacing with native
-   applications (e.g. C/C++).
- * World's fastest and first hard real-time XML
-   marshalling/unmarshalling facility.
- * Simple yet flexible configuration management of your application.
-
-WWW: http://javolution.org/
@@ -179,9 +179,6 @@
    SUBDIR += crack-attack
    SUBDIR += craft
    SUBDIR += crafty
-    SUBDIR += crafty-open-enormous
-    SUBDIR += crafty-open-large
-    SUBDIR += crafty-open-medium
    SUBDIR += crafty-tablebase-no-pawn
    SUBDIR += crashtest
    SUBDIR += cre
@@ -1,36 +0,0 @@
-# Created by: Jonathan Shoemaker <shoemaker@bluebottle.com>
-# $FreeBSD$
-
-PORTNAME=	crafty-open-enormous
-PORTVERSION=	20070924
-PORTREVISION=	1
-CATEGORIES=	games
-MASTER_SITES=	http://www.cis.uab.edu/hyatt/crafty/pgn/
-DISTFILES=	enormous.zip
-DIST_SUBDIR=	crafty
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Enormous opening book (about 270 MByte) for crafty
-
-BROKEN=		conflicts with games/crafty
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
-
-BUILD_DEPENDS=	crafty:games/crafty
-RUN_DEPENDS=	crafty:games/crafty
-
-USES=		zip
-NO_WRKSUBDIR=	yes
-CONFLICTS=	crafty-open-large-* crafty-open-medium-* crafty-open-default-*
-
-do-build:
-	@${ECHO_MSG} '================================================================'
-	@${ECHO_MSG} 'Ignore warnings about illegal moves.  These warnings are normal.'
-	@${ECHO_MSG} '================================================================'
-	(cd ${WRKSRC} && crafty bookpath=. <${FILESDIR}/book-building)
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty
-	${INSTALL_DATA} ${WRKSRC}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin
-
-.include <bsd.port.mk>
@@ -1,2 +0,0 @@
-SHA256 (crafty/enormous.zip) = c29bef354014e0cdb91644578101d48419f3aef15c300ab7eb01a1f11f392500
-SIZE (crafty/enormous.zip) = 282114811
@@ -1,2 +0,0 @@
-book create enormous.pgn 60 2 50
-quit
@@ -1,6 +0,0 @@
-This is the port of the enormous opening book for crafty.  It consumes
-about 85-90M.
-
-It was created with "book create enormous.pgn 60 2 50" (see the crafty
-documentation and online help for a more thorough explanation of what
-this does)
@@ -1 +0,0 @@
-@(nobody,nogroup,664) lib/crafty/book.bin
@@ -1,40 +0,0 @@
-# Created by: Stefan Eggers <seggers@semyam.dinoco.de>
-# $FreeBSD$
-
-PORTNAME=	crafty-open-large
-PORTVERSION=	20070909
-PORTREVISION=	2
-CATEGORIES=	games
-MASTER_SITES=	LOCAL/dd/crafty
-DISTFILES=	large1.zip large2.zip large3.zip large4.zip
-DIST_SUBDIR=	crafty
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Large opening book for crafty
-
-BROKEN=		conflicts with games/crafty
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
-
-BUILD_DEPENDS=	crafty:games/crafty
-RUN_DEPENDS=	crafty:games/crafty
-
-USES=		zip
-NO_WRKSUBDIR=	yes
-CONFLICTS=	crafty-open-enormous-* crafty-open-medium-* crafty-open-default-*
-
-post-extract:
-	${CAT} ${WRKSRC}/Book1.pgn ${WRKSRC}/Book2.pgn ${WRKSRC}/Book3.pgn ${WRKSRC}/Book4.pgn >${WRKSRC}/Book.pgn
-	${RM} ${WRKSRC}/Book1.pgn ${WRKSRC}/Book2.pgn ${WRKSRC}/Book3.pgn ${WRKSRC}/Book4.pgn
-
-do-build:
-	@${ECHO_MSG} '================================================================'
-	@${ECHO_MSG} 'Ignore warnings about illegal moves.  These warnings are normal.'
-	@${ECHO_MSG} '================================================================'
-	(cd ${WRKSRC} && crafty <${FILESDIR}/book-building)
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty
-	${INSTALL_DATA} ${WRKSRC}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin
-
-.include <bsd.port.mk>
@@ -1,8 +0,0 @@
-SHA256 (crafty/large1.zip) = 90f18e8d5084b9d63cad74b4e5996193e88008d98958d67aa0bf4d6e89eda6ae
-SIZE (crafty/large1.zip) = 6326344
-SHA256 (crafty/large2.zip) = 84136cfd51e1efc45e29ee25026814e740d713d74b5823f4376c251c982a0c20
-SIZE (crafty/large2.zip) = 6255452
-SHA256 (crafty/large3.zip) = 214a17b98e37406b6bcbb4c47ba9df5ce2ee867518a52bb5cace210ffe702a8e
-SIZE (crafty/large3.zip) = 6427389
-SHA256 (crafty/large4.zip) = 22ca2fbffae7e3b824985ab9f26abea64ecee35968f7811189f62b1b879f3767
-SIZE (crafty/large4.zip) = 4475843
@@ -1,2 +0,0 @@
-book create Book.pgn 60 2 50
-quit
@@ -1,5 +0,0 @@
-This is the port of the large opening book for crafty.
-
-It was created with "book create book.txt 60 2 50" (see the crafty
-documentation and online help for a more thorough explanation of what
-this does).
@@ -1 +0,0 @@
-@(nobody,nogroup,664) lib/crafty/book.bin
@@ -1,37 +0,0 @@
-# Created by: Stefan Eggers <seggers@semyam.dinoco.de>
-# $FreeBSD$
-
-PORTNAME=	crafty-open-medium
-PORTVERSION=	20070909
-PORTREVISION=	2
-CATEGORIES=	games
-MASTER_SITES=	LOCAL/dd/crafty
-DISTNAME=	medium
-DIST_SUBDIR=	crafty
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Medium opening book (about 1.9 MByte) for crafty
-
-BROKEN=		conflicts with games/crafty
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
-
-BUILD_DEPENDS=	crafty:games/crafty
-RUN_DEPENDS=	crafty:games/crafty
-
-USES=		zip
-NO_WRKSUBDIR=	yes
-CONFLICTS=	crafty-open-enormous-* crafty-open-large-* crafty-open-default-*
-
-do-build:
-	@${ECHO_MSG} '================================================================'
-	@${ECHO_MSG} 'Ignore warnings about illegal moves.  These warnings are normal.'
-	@${ECHO_MSG} '================================================================'
-	(cd ${WRKSRC} && crafty <${FILESDIR}/book-building)
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty
-	${INSTALL_DATA} ${WRKSRC}/book.bin \
-		${STAGEDIR}${PREFIX}/lib/crafty/book.bin
-
-.include <bsd.port.mk>
@@ -1,2 +0,0 @@
-SHA256 (crafty/medium.zip) = 5a509d00f99d8a4b8fc23e1e7f64a47733c85fc0a7e623eed6fb228101c4c45f
-SIZE (crafty/medium.zip) = 8714100
@@ -1,2 +0,0 @@
-book create book.txt 60 2 50
-quit
@@ -1,6 +0,0 @@
-This is the port of the medium opening book for crafty.  It consumes
-about 1.9 MByte.
-
-It was created with "book create book.txt 60 2 50" (see the crafty
-documentation and online help for a more thorough explanation of what
-this does)
@@ -1 +0,0 @@
-@(nobody,nogroup,664) lib/crafty/book.bin
@@ -77,7 +77,6 @@
    SUBDIR += jflex
    SUBDIR += jfreechart
    SUBDIR += jgraph
-    SUBDIR += jgrapht
    SUBDIR += jgraphx
    SUBDIR += jikes
    SUBDIR += jlex
@@ -1,65 +0,0 @@
-# Created by: ijliao
-# $FreeBSD$
-
-PORTNAME=	jgrapht
-PORTVERSION=	0.7.3
-PORTREVISION=	1
-CATEGORIES=	java math
-MASTER_SITES=	SF/${PORTNAME}/JGraphT/Version%20${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Java package for mathematical graph-theory objects and algorithms
-
-BROKEN=		fails to build
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
-
-USES=		dos2unix zip
-DOS2UNIX_GLOB=	*.xml *.java
-USE_JAVA=	yes
-JAVA_VERSION=	1.6 1.7
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-.if !defined(WITHOUT_COMPILE)
-USE_ANT=	yes
-ALL_TARGET=	jar
-.if ${PORT_OPTIONS:MDOCS}
-ALL_TARGET+=	javadoc
-.endif
-.else
-NO_BUILD=	yes
-.endif
-
-PORTDOCS=	*
-
-PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
-
-.include <bsd.port.pre.mk>
-
-JAVA_PORT_API=	${LOCALBASE}/share/doc/jdk${JAVA_PORT_VERSION:C/([0-9]\.[0-9])\.[0-9]/\1/}/api
-.if exists(${JAVA_PORT_API})
-MAKE_ARGS+=	-Djdk.api="${JAVA_PORT_API}"
-.endif
-
-pre-fetch:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "    WITHOUT_COMPILE=yes    Install the pre-compiled .jar file"
-	@${ECHO_MSG} ""
-
-do-install:
-	@${ECHO_MSG} -n  ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-jdk1.5.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
-	@${ECHO_MSG} " [DONE]"
-.if ${PORT_OPTIONS:MDOCS}
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@cd ${WRKSRC}/javadoc && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \;
-	@cd ${WRKSRC}/javadoc && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-	@${ECHO_MSG} " [DONE]"
-.endif
-
-.include <bsd.port.post.mk>
@@ -1,2 +0,0 @@
-SHA256 (jgrapht-0.7.3.zip) = e59bc448b55f8e32f9a3aed0103e733015b1c343f86c790a23df76997716ab81
-SIZE (jgrapht-0.7.3.zip) = 1668719
@@ -1,12 +0,0 @@
-Patch to allow the JDK API location to be passed to Ant using -Djdk.api
-
--- build.xml.orig	2016-06-20 15:06:43 UTC
-+++ build.xml
-@@ -355,6 +355,7 @@
-         <include name="**"/>
-         <exclude name="org/jgrapht/experimental/**"/>
-       </packageset>
-+      <link offline="true" packagelistLoc="${jdk.api}" href="${jdk.api}"/>
-     </javadoc>
-   </target>
- 
@@ -1,17 +0,0 @@
-JGraphT is a free Java graph library that provides mathematical graph-theory
-objects and algorithms. JGraphT supports various types of graphs including:
-    * directed and undirected graphs.
-    * graphs with weighted / unweighted / labeled or any user-defined edges.
-    * various edge multiplicity options, including: simple-graphs, multigraphs,
-      pseudographs.
-    * unmodifiable graphs - allow modules to provide "read-only" access to
-      internal graphs.
-    * listenable graphs - allow external listeners to track modification events.
-    * subgraphs graphs that are auto-updating subgraph views on other graphs.
-    * all compositions of above graphs.
-
-Although powerful, JGraphT is designed to be simple. For example, graph vertices
-can be of any objects. You can create graphs based on: Strings, URLs, XML
-documents, etc; you can even create graphs of graphs!
-
-WWW: http://jgrapht.sourceforge.net/
@@ -374,7 +374,6 @@
    SUBDIR += ucc
    SUBDIR += urweb
    SUBDIR += v8
-    SUBDIR += v8-devel
    SUBDIR += vala
    SUBDIR += visualworks
    SUBDIR += yabasic
@@ -1,68 +0,0 @@
-# Created by: siasia
-# $FreeBSD$
-
-PORTNAME=	v8
-PORTVERSION=	3.27.7
-PORTREVISION=	17
-CATEGORIES=	lang
-MASTER_SITES=	LOCAL/vanilla
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Open source JavaScript engine by Google
-
-LICENSE=	BSD3CLAUSE
-
-BROKEN=		fails to build
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
-
-LIB_DEPENDS=	libicui18n.so:devel/icu
-
-CONFLICTS_INSTALL=	v8-[0-9]*
-
-ONLY_FOR_ARCHS=	i386 amd64
-
-ALL_TARGET=	native
-MAKE_ARGS=	library=shared use_system_icu=on
-MAKE_ENV=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
-USE_LDCONFIG=	yes
-USE_CXXSTD=	gnu++11
-USES=		compiler:c++11-lib cpe gmake localbase python:2.7 shebangfix tar:xz
-
-CPE_VENDOR=	google
-
-SHEBANG_FILES=	build/gyp/gyp
-bash_CMD=	${SH}
-
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang
-CXXFLAGS+=	-Wno-nested-anon-types -Wno-unused-function -Wno-unused-private-field -Wno-unused-variable
-MAKE_ARGS+=	clang=on
-MAKE_ENV+=	LINK=clang++ AR=/usr/bin/ar
-.if ${COMPILER_VERSION} >= 34
-CXXFLAGS+=	-Wno-unused-const-variable
-.if ${COMPILER_VERSION} >= 35
-CXXFLAGS+=	-Wno-tautological-undefined-compare
-.endif
-.endif
-.else
-MAKE_ARGS+=	strictaliasing=off
-USE_GCC=	any
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|test/cctest/cctest.gyp||' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e '/test\/cctest\/cctest.gyp/d' ${WRKSRC}/build/all.gyp
-	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/build/shim_headers.gypi ${WRKSRC}/build/gyp/gyp ${WRKSRC}/tools/gyp/v8.gyp
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/build/toolchain.gypi ${WRKSRC}/tools/gyp/v8.gyp
-	@${REINPLACE_CMD} -e 's, | MAP_NORESERVE,,' ${WRKSRC}/src/platform-freebsd.cc
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/out/native/d8 ${STAGEDIR}${PREFIX}/bin/d8
-	cd ${WRKSRC}/include/ && ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/
-	${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${STAGEDIR}${PREFIX}/lib/libv8.so.1
-	${LN} -fs ${PREFIX}/lib/libv8.so.1 ${STAGEDIR}${PREFIX}/lib/libv8.so
-
-.include <bsd.port.post.mk>
@@ -1,2 +0,0 @@
-SHA256 (v8-3.27.7.tar.xz) = 1b93c506c27f934df092d4193a3caa5fc845141ea397bf0adbc6e6a81ba55db5
-SIZE (v8-3.27.7.tar.xz) = 34568660
@@ -1,95 +0,0 @@
-Backport of fix found here:
-https://github.com/joyent/node/commit/78b0e30954111cfaba0edbeee85450d8cbc6fdf6
-
-Note, this patch is modified to use ASSERT instead of DCHECK because
-this version of node is from before the rename which happened here:
-https://codereview.chromium.org/430503007
-
--- src/unicode-inl.h.orig	2013-05-01 12:56:29 UTC
-+++ src/unicode-inl.h
-@@ -168,6 +168,7 @@ unsigned Utf8::Length(uchar c, int previ
- 
- Utf8DecoderBase::Utf8DecoderBase()
-   : unbuffered_start_(NULL),
-+    unbuffered_length_(0),
-     utf16_length_(0),
-     last_byte_of_buffer_unused_(false) {}
- 
-@@ -207,8 +208,7 @@ unsigned Utf8Decoder<kBufferSize>::Write
-   if (length <= buffer_length) return length;
-   ASSERT(unbuffered_start_ != NULL);
-   // Copy the rest the slow way.
-  WriteUtf16Slow(unbuffered_start_,
-                 data + buffer_length,
-+  WriteUtf16Slow(unbuffered_start_, unbuffered_length_, data + buffer_length,
-                  length - buffer_length);
-   return length;
- }
--- src/unicode.cc.orig	2013-05-01 12:56:29 UTC
-+++ src/unicode.cc
-@@ -284,6 +284,7 @@ void Utf8DecoderBase::Reset(uint16_t* bu
-   // Assume everything will fit in the buffer and stream won't be needed.
-   last_byte_of_buffer_unused_ = false;
-   unbuffered_start_ = NULL;
-+  unbuffered_length_ = 0;
-   bool writing_to_buffer = true;
-   // Loop until stream is read, writing to buffer as long as buffer has space.
-   unsigned utf16_length = 0;
-@@ -310,6 +311,7 @@ void Utf8DecoderBase::Reset(uint16_t* bu
-         // Just wrote last character of buffer
-         writing_to_buffer = false;
-         unbuffered_start_ = stream;
-+        unbuffered_length_ = stream_length;
-       }
-       continue;
-     }
-@@ -319,20 +321,24 @@ void Utf8DecoderBase::Reset(uint16_t* bu
-     writing_to_buffer = false;
-     last_byte_of_buffer_unused_ = true;
-     unbuffered_start_ = stream - cursor;
-+    unbuffered_length_ = stream_length + cursor;
-   }
-   utf16_length_ = utf16_length;
- }
- 
- 
- void Utf8DecoderBase::WriteUtf16Slow(const uint8_t* stream,
-+                                     unsigned stream_length,
-                                      uint16_t* data,
-                                      unsigned data_length) {
-   while (data_length != 0) {
-     unsigned cursor = 0;
-    uint32_t character = Utf8::ValueOf(stream, Utf8::kMaxEncodedSize, &cursor);
-+
-+    uint32_t character = Utf8::ValueOf(stream, stream_length, &cursor);
-     // There's a total lack of bounds checking for stream
-     // as it was already done in Reset.
-     stream += cursor;
-+    stream_length -= cursor;
-     if (character > unibrow::Utf16::kMaxNonSurrogateCharCode) {
-       *data++ = Utf16::LeadSurrogate(character);
-       *data++ = Utf16::TrailSurrogate(character);
-@@ -343,6 +349,7 @@ void Utf8DecoderBase::WriteUtf16Slow(con
-       data_length -= 1;
-     }
-   }
-+  ASSERT(stream_length >= 0);
- }
- 
- 
--- src/unicode.h.orig	2013-05-01 12:56:29 UTC
-+++ src/unicode.h
-@@ -184,10 +184,10 @@ class Utf8DecoderBase {
-              unsigned buffer_length,
-              const uint8_t* stream,
-              unsigned stream_length);
-  static void WriteUtf16Slow(const uint8_t* stream,
-                             uint16_t* data,
-                             unsigned length);
-+  static void WriteUtf16Slow(const uint8_t* stream, unsigned stream_length,
-+                             uint16_t* data, unsigned length);
-   const uint8_t* unbuffered_start_;
-+  unsigned unbuffered_length_;
-   unsigned utf16_length_;
-   bool last_byte_of_buffer_unused_;
-  private:
@@ -1,37 +0,0 @@
--- Makefile.orig	2014-02-04 02:07:31 UTC
-+++ Makefile
-@@ -52,6 +52,14 @@ endif
- ifdef console
-   GYPFLAGS += -Dconsole=$(console)
- endif
-+# clang=on
-+ifeq ($(clang), on)
-+  GYPFLAGS += -Dclang=1
-+endif
-+# use_system_icu=on
-+ifeq ($(use_system_icu), on)
-+  GYPFLAGS += -Duse_system_icu=1
-+endif
- # disassembler=on
- ifeq ($(disassembler), on)
-   GYPFLAGS += -Dv8_enable_disassembler=1
-@@ -386,8 +394,7 @@ clean: $(addsuffix .clean, $(ARCHES) $(A
- # GYP file generation targets.
- OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS))
- $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
-	PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
-	PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \
-+	PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
- 	GYP_GENERATORS=make \
- 	build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
- 	              -Ibuild/standalone.gypi --depth=. \
-@@ -396,8 +403,7 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
- 	              -S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS)
- 
- $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
-	PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
-	PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \
-+	PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
- 	GYP_GENERATORS=make \
- 	build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
- 	              -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)
@@ -1,13 +0,0 @@
--- src/allocation-tracker.cc.orig	2014-06-03 08:52:11 UTC
-+++ src/allocation-tracker.cc
-@@ -152,8 +152,8 @@ void AddressToTraceMap::Clear() {
- void AddressToTraceMap::Print() {
-   PrintF("[AddressToTraceMap (%" V8PRIuPTR "): \n", ranges_.size());
-   for (RangeMap::iterator it = ranges_.begin(); it != ranges_.end(); ++it) {
-    PrintF("[%p - %p] => %u\n", it->second.start, it->first,
-        it->second.trace_node_id);
-+    PrintF("[%p - %p] => %u\n", reinterpret_cast<void*>(it->second.start),
-+        reinterpret_cast<void*>(it->first), it->second.trace_node_id);
-   }
-   PrintF("]\n");
- }
@@ -1,29 +0,0 @@
--- src/deoptimizer.cc.orig	2014-06-03 08:52:11 UTC
-+++ src/deoptimizer.cc
-@@ -1920,7 +1920,7 @@ void Deoptimizer::MaterializeHeapObjects
-              "Materialized a new heap number %p [%e] in slot %p\n",
-              reinterpret_cast<void*>(*num),
-              d.value(),
-             d.destination());
-+             reinterpret_cast<void*>(d.destination()));
-     }
-     Memory::Object_at(d.destination()) = *num;
-   }
-@@ -2017,7 +2017,7 @@ void Deoptimizer::MaterializeHeapNumbers
-                "for parameter slot #%d\n",
-                reinterpret_cast<void*>(*num),
-                d.value(),
-               d.destination(),
-+               reinterpret_cast<void*>(d.destination()),
-                index);
-       }
- 
-@@ -2034,7 +2034,7 @@ void Deoptimizer::MaterializeHeapNumbers
-                "for expression slot #%d\n",
-                reinterpret_cast<void*>(*num),
-                d.value(),
-               d.destination(),
-+               reinterpret_cast<void*>(d.destination()),
-                index);
-       }
- 
@@ -1,61 +0,0 @@
--- src/heap-snapshot-generator.cc.orig	2014-06-03 08:52:11 UTC
-+++ src/heap-snapshot-generator.cc
-@@ -410,8 +410,8 @@ bool HeapObjectsMap::MoveObject(Address 
-     // object is migrated.
-     if (FLAG_heap_profiler_trace_objects) {
-       PrintF("Move object from %p to %p old size %6d new size %6d\n",
-             from,
-             to,
-+             reinterpret_cast<void*>(from),
-+             reinterpret_cast<void*>(to),
-              entries_.at(from_entry_info_index).size,
-              object_size);
-     }
-@@ -451,7 +451,7 @@ SnapshotObjectId HeapObjectsMap::FindOrA
-     entry_info.accessed = accessed;
-     if (FLAG_heap_profiler_trace_objects) {
-       PrintF("Update object size : %p with old size %d and new size %d\n",
-             addr,
-+             reinterpret_cast<void*>(addr),
-              entry_info.size,
-              size);
-     }
-@@ -486,9 +486,9 @@ void HeapObjectsMap::UpdateHeapObjectsMa
-     FindOrAddEntry(obj->address(), obj->Size());
-     if (FLAG_heap_profiler_trace_objects) {
-       PrintF("Update object      : %p %6d. Next address is %p\n",
-             obj->address(),
-+             reinterpret_cast<void*>(obj->address()),
-              obj->Size(),
-             obj->address() + obj->Size());
-+             reinterpret_cast<void*>(obj->address() + obj->Size()));
-     }
-   }
-   RemoveDeadEntries();
-@@ -516,20 +516,20 @@ struct HeapObjectInfo {
-   void Print() const {
-     if (expected_size == 0) {
-       PrintF("Untracked object   : %p %6d. Next address is %p\n",
-             obj->address(),
-+             reinterpret_cast<void*>(obj->address()),
-              obj->Size(),
-             obj->address() + obj->Size());
-+             reinterpret_cast<void*>(obj->address() + obj->Size()));
-     } else if (obj->Size() != expected_size) {
-       PrintF("Wrong size %6d: %p %6d. Next address is %p\n",
-              expected_size,
-             obj->address(),
-+             reinterpret_cast<void*>(obj->address()),
-              obj->Size(),
-             obj->address() + obj->Size());
-+             reinterpret_cast<void*>(obj->address() + obj->Size()));
-     } else {
-       PrintF("Good object      : %p %6d. Next address is %p\n",
-             obj->address(),
-+             reinterpret_cast<void*>(obj->address()),
-              expected_size,
-             obj->address() + obj->Size());
-+             reinterpret_cast<void*>(obj->address() + obj->Size()));
-     }
-   }
- };
@@ -1,11 +0,0 @@
--- src/ia32/code-stubs-ia32.cc.orig	2014-06-03 08:52:11 UTC
-+++ src/ia32/code-stubs-ia32.cc
-@@ -3143,7 +3143,7 @@ void StringCharFromCodeGenerator::Genera
-   ASSERT(IsPowerOf2(String::kMaxOneByteCharCode + 1));
-   __ test(code_,
-           Immediate(kSmiTagMask |
-                    ((~String::kMaxOneByteCharCode) << kSmiTagSize)));
-+                    ((~String::kMaxOneByteCharCodeU) << kSmiTagSize)));
-   __ j(not_zero, &slow_case_);
- 
-   Factory* factory = masm->isolate()->factory();
@@ -1,11 +0,0 @@
--- src/ia32/disasm-ia32.cc.orig	2014-06-03 08:52:11 UTC
-+++ src/ia32/disasm-ia32.cc
-@@ -1743,7 +1743,7 @@ int Disassembler::ConstantPoolSizeAt(byt
-     buffer[0] = '\0';
-     byte* prev_pc = pc;
-     pc += d.InstructionDecode(buffer, pc);
-    fprintf(f, "%p", prev_pc);
-+    fprintf(f, "%p", reinterpret_cast<void*>(prev_pc));
-     fprintf(f, "    ");
- 
-     for (byte* bp = prev_pc; bp < pc; bp++) {
@@ -1,12 +0,0 @@
--- src/ia32/ic-ia32.cc.orig	2014-06-03 08:52:11 UTC
-+++ src/ia32/ic-ia32.cc
-@@ -1262,7 +1262,8 @@ void PatchInlinedSmiCode(Address address
-   uint8_t delta = *reinterpret_cast<uint8_t*>(delta_address);
-   if (FLAG_trace_ic) {
-     PrintF("[  patching ic at %p, test=%p, delta=%d\n",
-           address, test_instruction_address, delta);
-+           reinterpret_cast<void*>(address),
-+           reinterpret_cast<void*>(test_instruction_address), delta);
-   }
- 
-   // Patch with a short conditional jump. Enabling means switching from a short
@@ -1,11 +0,0 @@
--- src/liveedit.cc.orig	2014-06-03 08:52:11 UTC
-+++ src/liveedit.cc
-@@ -174,7 +174,7 @@ class Differencer {
- 
-   static const int kDirectionSizeBits = 2;
-   static const int kDirectionMask = (1 << kDirectionSizeBits) - 1;
-  static const int kEmptyCellValue = -1 << kDirectionSizeBits;
-+  static const int kEmptyCellValue = -(1 << kDirectionSizeBits);
- 
-   // This method only holds static assert statement (unfortunately you cannot
-   // place one in class scope).
@@ -1,13 +0,0 @@
--- src/objects.h.orig	2014-06-03 08:52:11 UTC
-+++ src/objects.h
-@@ -8824,8 +8824,8 @@ class Name: public HeapObject {
-   STATIC_ASSERT(IS_POWER_OF_TWO(kMaxCachedArrayIndexLength + 1));
- 
-   static const unsigned int kContainsCachedArrayIndexMask =
-      (~kMaxCachedArrayIndexLength << ArrayIndexLengthBits::kShift) |
-      kIsNotArrayIndexMask;
-+      (~static_cast<unsigned>(kMaxCachedArrayIndexLength)
-+      << ArrayIndexLengthBits::kShift) | kIsNotArrayIndexMask;
- 
-   // Value of empty hash field indicating that the hash is not computed.
-   static const int kEmptyHashField =
@@ -1,11 +0,0 @@
--- src/x64/disasm-x64.cc.orig	2016-01-17 13:52:37 UTC
-+++ src/x64/disasm-x64.cc
-@@ -1894,7 +1894,7 @@ void Disassembler::Disassemble(FILE* f, 
-     buffer[0] = '\0';
-     byte* prev_pc = pc;
-     pc += d.InstructionDecode(buffer, pc);
-    fprintf(f, "%p", prev_pc);
-+    fprintf(f, "%p", reinterpret_cast<void*>(prev_pc));
-     fprintf(f, "    ");
- 
-     for (byte* bp = prev_pc; bp < pc; bp++) {
@@ -1,12 +0,0 @@
--- src/x64/ic-x64.cc.orig	2016-01-17 13:52:46 UTC
-+++ src/x64/ic-x64.cc
-@@ -1283,7 +1283,8 @@ void PatchInlinedSmiCode(Address address
-   uint8_t delta = *reinterpret_cast<uint8_t*>(delta_address);
-   if (FLAG_trace_ic) {
-     PrintF("[  patching ic at %p, test=%p, delta=%d\n",
-           address, test_instruction_address, delta);
-+           reinterpret_cast<void*>(address),
-+           reinterpret_cast<void*>(test_instruction_address), delta);
-   }
- 
-   // Patch with a short conditional jump. Enabling means switching from a short
@@ -1,10 +0,0 @@
--- src/runtime.cc.orig	2014-06-03 08:52:11 UTC
-+++ src/runtime.cc
-@@ -56,6 +56,7 @@
- #include "unicode/dtfmtsym.h"
- #include "unicode/dtptngen.h"
- #include "unicode/locid.h"
-+#include "unicode/normlzr.h"
- #include "unicode/numfmt.h"
- #include "unicode/numsys.h"
- #include "unicode/rbbi.h"
@@ -1,14 +0,0 @@
-V8 is Google's open source JavaScript engine.
-
-V8 is written in C++ and is used in Google Chrome, the open source browser from
-Google.
-
-V8 implements ECMAScript as specified in ECMA-262, 5th edition, and runs on
-Windows (XP or newer), Mac OS X (10.5 or newer), and Linux systems that use
-IA-32, x64, or ARM processors.
-
-V8 can run standalone, or can be embedded into any C++ application.
-
-Git repository at https://github.com/v8/v8
-
-WWW: http://code.google.com/p/v8/
@@ -1,11 +0,0 @@
-bin/d8
-include/v8-debug.h
-include/v8-platform.h
-include/v8-profiler.h
-include/v8-testing.h
-include/v8-util.h
-include/v8.h
-include/v8config.h
-include/v8stdint.h
-lib/libv8.so
-lib/libv8.so.1
@@ -263,7 +263,6 @@
    SUBDIR += mulberry
    SUBDIR += mutt
    SUBDIR += mutt-lite
-    SUBDIR += mutt14
    SUBDIR += mutt14-lite
    SUBDIR += mutt_vc_query
    SUBDIR += muttils
@@ -1,178 +0,0 @@
-# Created by: David O'Brien (obrien@NUXI.com)
-# $FreeBSD$
-
-PORTNAME=	mutt
-PORTVERSION=	1.4.2.3
-PORTREVISION=	2
-CATEGORIES+=	mail ipv6
-MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/mutt/
-
-PATCHVERSION=	1.4.2.2
-PATCH_SITES=	http://www.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
-		http://www2.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
-		http://www3.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
-		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PATCHVERSION}/:vvv \
-		ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${PATCHVERSION}/:vvv
-PATCHFILES=	patch-${PATCHVERSION}.rr.compressed.gz:vvv \
-		patch-${PATCHVERSION}.vvv.initials.gz:vvv
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER?=	udo.schweigert@siemens.com
-COMMENT?=	The Mongrel of Mailers (part Elm, Pine, Mush, mh, etc.)
-
-DEPRECATED=	mutt 1.4.x has been out of support for 10+ years use mail/mutt
-EXPIRATION_DATE=	2018-08-20
-
-CONFLICTS?=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-devel-[0-9]* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* mutt-[^1].[^4]*
-PKGNAMESUFFIX=	14
-
-OPTIONS_DEFINE=	NLS LOCALES_FIX MUTT_XFACE MUTT_FLOCK MUTT_ICONV GSSAPI DOCS EXAMPLES
-OPTIONS_DEFAULT=	MUTT_FLOCK MUTT_ICONV GSSAPI
-
-OPTIONS_RADIO=		CONS
-OPTIONS_RADIO_CONS=	SLANG NCURSES
-
-.if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE)
-OPTIONS_DEFAULT+=	SLANG
-.endif
-
-CONS_DESC=	Console driver (if none chosen, uses ncurses from base system)
-SLANG_DESC=	Adds display/screen management via S-Lang
-NCURSES_DESC=	Adds console graphics support with ncurses from ports
-LOCALES_FIX_DESC=	Enable locales fixes
-MUTT_XFACE_DESC=	Adds mutt X-Face support
-MUTT_FLOCK_DESC=	Use flock() for file locks
-MUTT_ICONV_DESC=	Enable mutt's iconv character conversion feature
-
-USES+=	ssl
-
-.if defined (MUTT_LITE)
-PKGNAMESUFFIX=	14-lite
-.endif
-
-.include <bsd.port.options.mk>
-
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
-.if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE)
-WITH_SLANG=	yes
-BUILD_DEPENDS=	ispell:textproc/aspell-ispell
-RUN_DEPENDS+=	ispell:textproc/aspell-ispell \
-		urlview:textproc/urlview
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext iconv
-.if ! ${PORT_OPTIONS:MMUTT_ICONV}
-IGNORE=	the MUTT_ICONV options of the mutt port only be disabled if \
-	NLS is also disabled
-.endif
-.elif ${PORT_OPTIONS:MMUTT_ICONV}
-USES+=	iconv
-.endif
-
-.if ${PORT_OPTIONS:MSLANG}
-LIB_DEPENDS+=	libslang.so:devel/libslang2
-.elif ${PORT_OPTIONS:MNCURSES}
-USES+=	ncurses:port
-.else
-USES+=	ncurses
-.endif
-.if !defined (MUTT_LITE)
-.if defined(WITH_MUTT_CYRUS_SASL)
-IGNORE=	the SASL support for mutt has been withdrawn. Please use the mutt-devel port instead
-.endif
-.if ${PORT_OPTIONS:MMUTT_XFACE}
-PATCH_DEPENDS+=	${NONEXISTENT}:news/slrnface:extract
-RUN_DEPENDS+=	slrnface:news/slrnface
-PKGMESSAGE=	${PKGDIR}/pkg-message.xface
-.endif
-.endif
-
-DIST_SUBDIR=	mutt
-WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
-GNU_CONFIGURE=	yes
-USES+=		autoreconf
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include"
-CONFIGURE_ARGS=	--enable-pop --enable-imap --disable-fcntl \
-		--with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \
-		--with-sharedir=${PREFIX}/share/mutt \
-		--with-docdir=${DOCSDIR} --with-charmaps \
-		--enable-compressed
-.if defined(MUTT_CONFIGURE_ARGS)
-CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
-.endif
-.if ${PORT_OPTIONS:MMUTT_FLOCK}
-CONFIGURE_ARGS+=	--enable-flock
-.else
-CONFIGURE_ARGS+=	--disable-flock
-.endif
-.if ${PORT_OPTIONS:MLOCALES_FIX}
-CONFIGURE_ARGS+=	--enable-locales-fix
-.endif
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-.if ! ${PORT_OPTIONS:MMUTT_ICONV} && ! ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+=	--disable-iconv
-.else
-CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG}
-.endif
-.if ${PORT_OPTIONS:MSLANG}
-CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif ${PORT_OPTIONS:MNCURSES}
-CONFIGURE_ARGS+=	--with-curses=${NCURSESBASE}
-CFLAGS+=	-I${NCURSESINC}
-.endif
-.if ${PORT_OPTIONS:MGSSAPI}
-.if exists(${LOCALBASE}/bin/gss-client)
-LIB_DEPENDS+=		libgssapi_krb5.so:security/krb5
-CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
-.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=	--with-gss
-WITH_MUTT_KRB5_SYS=YES
-.endif
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
-		${WRKSRC}/contrib/gpg.rc
-	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
-		${WRKSRC}/contrib/pgp6.rc
-	@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
-		${WRKSRC}/contrib/Makefile.in
-.if ${PORT_OPTIONS:MMUTT_XFACE}
-	@${ECHO} "===>  Applying XFACE patch"
-	slrnface_dir=`${FIND} ${WRKDIR}/../../../news/slrnface/work -type d \
-			-name slrnface-\*`; \
-	cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-post-build:
-	@${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
-	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
-		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
-		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
-		${WRKSRC}/doc/mutt.man
-	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
-		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
-		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
-		${WRKSRC}/doc/muttrc.man
-.endif
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${ECHO} "===>   Installing Mutt documentation"
-	@${MKDIR} ${STAGEDIR}${DOCSDIR} && ${CHMOD} a+rx ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${INSTALL_DATA} manual.txt PGP-Notes.txt \
-		${STAGEDIR}${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
@@ -1,6 +0,0 @@
-SHA256 (mutt/mutt-1.4.2.3.tar.gz) = 1a4920e5efccd6a83932af4223cb568956158f62e9f595798acc4004aca6ace5
-SIZE (mutt/mutt-1.4.2.3.tar.gz) = 2646433
-SHA256 (mutt/patch-1.4.2.2.rr.compressed.gz) = 3f70a8b666e1dd5342acb418aac8cb4a1ab68559b389346052bb1078a3b8dfee
-SIZE (mutt/patch-1.4.2.2.rr.compressed.gz) = 10191
-SHA256 (mutt/patch-1.4.2.2.vvv.initials.gz) = 2ab42c9bd369bacf7cad603e242e110c9adfdf18f477ce065fef8dbfbd1a8474
-SIZE (mutt/patch-1.4.2.2.vvv.initials.gz) = 690
@@ -1,12 +0,0 @@
--- doc/mutt.man.orig	Mon Jul 13 12:50:38 1998
-+++ doc/mutt.man	Thu Oct  1 22:15:40 1998
-@@ -20,7 +20,8 @@
- .SH DESCRIPTION
- Mutt is a small but very powerful text based program for reading electronic
- mail under unix operating systems, including support color terminals, MIME,
-and a threaded sorting mode.
-+and a threaded sorting mode.  Details of how to use all of this is
-+available in \fI${DOCSDIR}\fP.
- .SH OPTIONS
- .IP "-a \fIfile\fP"
- Attach a file to your message using MIME.
@@ -1,22 +0,0 @@
--- Makefile.am.orig	2007-05-23 03:17:52.000000000 +0200
-+++ Makefile.am	2015-12-29 17:27:11.713299000 +0100
-@@ -2,7 +2,7 @@
- ## Use aclocal -I m4; automake --foreign
- 
- AUTOMAKE_OPTIONS = foreign
-EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc
-+EXTRA_PROGRAMS = mutt_dotlock pgpewrap pgpring makedoc
- 
- if BUILD_IMAP
- IMAP_SUBDIR = imap
-@@ -90,6 +90,10 @@
- pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) 
- pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
- 
-+pgpewrap_SOURCES = pgpewrap.c
-+pgpewrap_LDADD = @LIBOBJS@ $(INTLLIBS) 
-+pgpewrap_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
-+
- mutt_dotlock.c: dotlock.c
- 	cp $(srcdir)/dotlock.c mutt_dotlock.c
- 
@@ -1,10 +0,0 @@
--- Muttrc.orig	Sat May 13 08:30:44 2000
-+++ Muttrc	Sat May 13 08:32:05 2000
-@@ -629,6 +629,7 @@
- # Type: boolean
- # Default: yes
- # 
-+set followup_to=no
- # 
- # Controls whether or not the Mail-Followup-To header field is
- # generated when sending mail.  When set, Mutt will generate this
@@ -1,14 +0,0 @@
--- configure.in.orig	2007-05-26 17:58:12.000000000 -0700
-+++ configure.in	2012-05-03 18:04:49.000000000 -0700
-@@ -31,6 +31,2 @@
- AC_ISC_POSIX
-AM_C_PROTOTYPES
-if test "x$U" != "x"; then
-  AC_MSG_ERROR(Compiler not ANSI compliant)
-fi
- AC_PROG_CPP
-@@ -629,3 +625,3 @@
- if test x$GCC = xyes -a $mutt_cv_warnings = yes; then
-        CFLAGS="-Wall -pedantic $CFLAGS"
-+        CFLAGS="-Wall $CFLAGS"
- fi
@@ -1,11 +0,0 @@
--- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
-+++ contrib/Makefile.in	Mon Mar 21 08:12:59 2005
-@@ -20,7 +20,7 @@
- 
- subdir = contrib
- 
-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
- 	sample.muttrc  sample.mailcap sample.muttrc-tlr
- 
- DISTFILES = Makefile.in language.txt language50.txt  \
@@ -1,21 +0,0 @@
--- doc/Makefile.in.orig	2007-05-23 03:17:52.000000000 +0200
-+++ doc/Makefile.in	2014-05-13 08:16:43.000000000 +0200
-@@ -98,18 +98,6 @@
- 	-rm -rf $(DESTDIR)$(docdir)
- 
- check:
-manual.txt: manual.sgml
-	if sgml2txt -c latin manual ; then \
-		uniq < manual.txt | expand > _manual.txt ; \
-		rm manual.txt ; \
-		mv _manual.txt manual.txt ;\
-	fi
-
-manual.html: manual.sgml
-	sgml2html manual  || true
-
-manual.ps: manual.sgml
-	sgml2latex --output=ps manual || true
- 
- clean: 
- 	rm -f *~ *.html *.orig *.rej  stamp-doc-sgml stamp-doc-man *.ps
@@ -1,34 +0,0 @@
--- doc/mutt.man.orig	Wed Jul 24 10:41:31 2002
-+++ doc/mutt.man	Sun Oct 26 11:06:36 2003
-@@ -136,9 +136,9 @@
- User's personal mapping between MIME types and file extensions.
- .IP "/etc/mime.types"
- System mapping between MIME types and file extensions.
-.IP "/usr/local/bin/mutt_dotlock"
-+.IP "${PREFIX}/bin/mutt_dotlock"
- The privileged dotlocking program.
-.IP "/usr/local/doc/mutt/manual.txt"
-+.IP "${DOCSDIR}/manual.txt"
- The Mutt manual.
- .SH BUGS
- .PP
--- doc/muttrc.man	Sun Oct 26 11:09:09 2003
-+++ doc/muttrc.man	Sun Oct 26 11:08:48 2003
-@@ -990,7 +972,7 @@
- .B dotlock_program
- .nf
- Type: path
-Default: \(lq/usr/local/bin/mutt_dotlock\(rq
-+Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq
- .fi
- .IP
- Contains the path of the mutt_dotlock (8) binary to be used by
-@@ -3970,7 +3952,7 @@
- instead of a raw socket. You may be able to use this to set up
- preauthenticated connections to your IMAP/POP3 server. Example:
- .IP
-tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq
-+tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq
- .IP
- NOTE: For this example to work you must be able to log in to the remote
- machine without having to enter a password.
@@ -1,13 +0,0 @@
--- doc/manual.sgml.orig	Tue May  9 17:15:26 2000
-+++ doc/manual.sgml	Fri May 12 11:05:40 2000
-@@ -1,5 +1,8 @@
-<!doctype linuxdoc system>
-
-+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
-+<!ENTITY dquot "&#34;">
-+]>
-+<linuxdoc>
-+  
- <article>
- 
- <title>The Mutt E-Mail Client
@@ -1,50 +0,0 @@
--- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
-+++ contrib/Makefile.in	Wed Mar 26 11:45:15 2003
-@@ -12,6 +12,7 @@
- mandir = @mandir@
- srcdir = @srcdir@
- docdir = @docdir@
-+samplesdir = @samplesdir@
- top_srcdir = @top_srcdir@
- top_builddir = ..
- INSTALL = @INSTALL@
-@@ -37,12 +38,12 @@
- check:
- 
- install:
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
- 	for f in $(SAMPLES) ; do \
-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
-+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir);	\
- 	done
- 	for f in $(srcdir)/iconv/*.rc ; do					\
-		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
-+		$(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv	  ;	\
- 	done
- 
- # Nothing needs to be done - uninstall in doc removes samples as well.
--- init.h.orig	Wed Mar 26 11:50:36 2003
-+++ init.h	Wed Mar 26 12:54:37 2003
-@@ -1347,8 +1347,8 @@
-   ** .pp
-   ** For examples on how to configure these formats for the various versions
-   ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in
-  ** the samples/ subdirectory which has been installed on your system
-  ** alongside the documentation.
-+  ** the share/examples/mutt subdirectory which has been installed on your
-+  ** system.
-   */
-   { "pgp_getkeys_command",	DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
-   /*
--- Makefile.am.orig	Wed Mar 26 13:13:10 2003
-+++ Makefile.am	Wed Mar 26 13:25:40 2003
-@@ -13,7 +13,7 @@
- 
- bin_SCRIPTS = muttbug flea
- 
-BUILT_SOURCES = keymap_defs.h patchlist.c
-+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
- 
- bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
- mutt_SOURCES = $(BUILT_SOURCES) \
@@ -1,39 +0,0 @@
--- init.c.orig	Wed Jul 24 10:41:29 2002
-+++ init.c	Sat May  3 08:46:29 2003
-@@ -1707,7 +1707,11 @@
- void mutt_init (int skip_sys_rc, LIST *commands)
- {
-   struct passwd *pw;
-+#if __FreeBSD_version < 500000
-+  char nodename[STRING];
-+#else
-   struct utsname utsname;
-+#endif
-   char *p, buffer[STRING], error[STRING];
-   int i, default_rc = 0, need_pause = 0;
-   BUFFER err;
-@@ -1765,16 +1769,21 @@
- #endif
- 
-   /* And about the host... */
-+#if __FreeBSD_version < 500000
-+  gethostname(nodename, sizeof (nodename));
-+#else
-   uname (&utsname);
-+  strfcpy (nodename, utsname.nodename, sizeof (nodename));
-+#endif
-   /* some systems report the FQDN instead of just the hostname */
-  if ((p = strchr (utsname.nodename, '.')))
-+  if ((p = strchr (nodename, '.')))
-   {
-    Hostname = mutt_substrdup (utsname.nodename, p);
-+    Hostname = mutt_substrdup (nodename, p);
-     p++;
-     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
-   }
-   else
-    Hostname = safe_strdup (utsname.nodename);
-+    Hostname = safe_strdup (nodename);
- 
- #ifndef DOMAIN
- #define DOMAIN buffer
@@ -1,33 +0,0 @@
--- m4/gssapi.m4.orig	Wed Apr 17 19:05:04 2002
-+++ m4/gssapi.m4	Mon Oct 16 10:59:34 2006
-@@ -6,10 +6,13 @@
- dnl if it is set and not "yes".
- dnl Defines GSSAPI_CFLAGS and GSSAPI_LIBS if found.
- dnl Defines GSSAPI_IMPL to "Heimdal", "MIT", or "OldMIT", or "none" if not found
-AC_DEFUN(MUTT_AM_PATH_GSSAPI,
-+AC_DEFUN([MUTT_AM_PATH_GSSAPI],
- [
-   GSSAPI_PREFIX=[$]$1
-   GSSAPI_IMPL="none"
-+  saved_CPPFLAGS="$CPPFLAGS"
-+  saved_LDFLAGS="$LDFLAGS"
-+  saved_LIBS="$LIBS"
-   dnl First try krb5-config
-   if test "$GSSAPI_PREFIX" != "yes"
-   then
-@@ -24,14 +27,11 @@
-     GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`"
-     case "`$KRB5CFGPATH --version`" in
-       "Kerberos 5 "*)	GSSAPI_IMPL="MIT";;
-      [hH]eimdal*)		GSSAPI_IMPL="Heimdal";;
-+      *[[hH]]eimdal*)		GSSAPI_IMPL="Heimdal";;
-       *)		GSSAPI_IMPL="Unknown";;
-    esac
-   else
-     dnl No krb5-config, run the old code
-    saved_CPPFLAGS="$CPPFLAGS"
-    saved_LDFLAGS="$LDFLAGS"
-    saved_LIBS="$LIBS"
-     if test "$GSSAPI_PREFIX" != "yes"
-     then
-       GSSAPI_CFLAGS="-I$GSSAPI_PREFIX/include"
@@ -1,11 +0,0 @@
--- imap/message.c.orig	2007-05-23 03:17:53.000000000 +0200
-+++ imap/message.c	2013-06-04 00:53:42.000000000 +0200
-@@ -435,7 +435,7 @@
-   rewind (fp);
-   
-   imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
-  snprintf (buf, sizeof (buf), "APPEND %s (\\Seen) {%d}", mbox, len);
-+  snprintf (buf, sizeof (buf), "APPEND %s (\\Seen) {%lu}", mbox, (unsigned long)len);
- 
-   imap_cmd_start (idata, buf);
- 
@@ -1,15 +0,0 @@
--- muttlib.c.orig	Fri May  7 17:30:35 2004
-+++ muttlib.c	Fri May  7 17:32:13 2004
-@@ -656,7 +656,11 @@
- 
- void mutt_mktemp (char *s)
- {
-  snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getpid (), Counter++);
-+  char t[7];
-+  snprintf (t, 7, "-%05d", Counter++);
-+  snprintf (s, _POSIX_PATH_MAX-6, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));
-+  mktemp (s);
-+  strncat(s, t, 6);
-   unlink (s);
- }
- 
@@ -1,18 +0,0 @@
--- Makefile.am.orig	2007-05-23 01:17:52 UTC
-+++ Makefile.am
-@@ -121,15 +121,6 @@ patchlist.c: $(srcdir)/PATCHES $(srcdir)
- 	$(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
- 
- install-exec-local:
-	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then	\
-		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
-		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
-	fi
-	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
-		chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
-		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
-		{ echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
-	fi
- 
- install-data-local: Muttrc
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
@@ -1,87 +0,0 @@
--- curs_lib.c.old	Wed Sep  1 19:39:20 1999
-+++ curs_lib.c	Sun Sep 26 23:47:03 1999
-@@ -156,6 +156,16 @@
-       def = 0;
-       break;
-     }
-+    else if (tolower(ch.ch) == 'y')
-+    {
-+      def = 1;
-+      break;
-+    }
-+    else if (tolower(ch.ch) == 'n')
-+    {
-+      def = 0;
-+      break;
-+    }
-     else
-     {
-       BEEP();
-@@ -413,8 +423,9 @@
- {
-   event_t ch;
-   int choice;
-  char *p;
-+  char *p, *nletters;
- 
-+  nletters = _(letters);
-   mvaddstr (LINES - 1, 0, prompt);
-   clrtoeol ();
-   FOREVER
-@@ -428,6 +439,12 @@
-     }
-     else
-     {
-+      p = strchr (nletters, ch.ch);
-+      if (p)
-+      {
-+	choice = p - nletters + 1;
-+	break;
-+      }
-       p = strchr (letters, ch.ch);
-       if (p)
-       {
--- browser.c.orig	Fri Sep 24 01:08:08 1999
-+++ browser.c	Sun Sep 26 23:46:25 1999
-@@ -750,7 +750,7 @@
- 	  switch (mutt_multi_choice ((reverse) ?
- 	      _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ") :
- 	      _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "),
-	      _("dazn")))
-+	      N_("dazn")))
- 	  {
- 	    case -1: /* abort */
- 	      resort = 0;
--- commands.c.orig	Wed Jul  7 02:56:24 1999
-+++ commands.c	Sun Sep 26 23:46:25 1999
-@@ -337,7 +337,7 @@
-   switch (mutt_multi_choice (reverse ?
- 			     _("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ") :
- 			     _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "),
-			     _("dfrsotuzc")))
-+			     N_("dfrsotuzc")))
-   {
-   case -1: /* abort - don't resort */
-     return -1;
--- compose.c.orig	Mon Feb 12 18:02:38 2001
-+++ compose.c	Fri Mar 30 17:04:09 2001
-@@ -130,7 +130,7 @@
-   char input_signas[SHORT_STRING];
- 
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
-			     _("esabf")))
-+			     N_("esabf")))
-   {
-   case 1: /* (e)ncrypt */
-     bits |= PGPENCRYPT;
--- muttlib.c.orig	Sun Apr  9 14:39:02 2000
-+++ muttlib.c	Fri May 12 11:26:58 2000
-@@ -671,7 +671,7 @@
-   if (*append == 0 && access (fname, F_OK) == 0)
-   {
-     switch (mutt_multi_choice
-	    (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), _("oac")))
-+	    (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), N_("oac")))
-     {
-       case -1: /* abort */
-       case 3:  /* cancel */
@@ -1,73 +0,0 @@
-written by Nicolas Rachinsky <nr@rachinsky.de>
-http://www.rachinsky.de
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published
-by the Free Software Foundation;  version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
--- mutt-1.3.28.ori/mutt.h	Thu Mar 14 19:22:25 2002
-+++ mutt.h	Fri Mar 15 00:22:41 2002
-@@ -198,6 +198,7 @@
-   M_LIMIT,
-   M_EXPIRED,
-   M_SUPERSEDED,
-+  M_THREADCOMPLETE,
- 
-   /* actions for mutt_pattern_comp/mutt_pattern_exec */
-   M_AND,
--- mutt-1.3.28.ori/pattern.c	Thu Mar 14 19:22:26 2002
-+++ pattern.c	Fri Mar 15 00:23:52 2002
-@@ -50,6 +50,7 @@
- }
- Flags[] =
- {
-+  { 'a', M_THREADCOMPLETE,	0,		NULL },
-   { 'A', M_ALL,			0,		NULL },
-   { 'b', M_BODY,		M_FULL_MSG,	eat_regexp },
-   { 'B', M_WHOLE_MSG,		M_FULL_MSG,	eat_regexp },
-@@ -957,6 +958,27 @@
-   return alladdr;
- }
- 
-+static int match_threadcomplete(int flag,THREAD *t,int left,int up,int right,int down)
-+{
-+	int a=0;
-+	HEADER *h=NULL;
-+
-+	if(! t)return 0;
-+	h=t->message;
-+	if(! flag && h && h->tagged)return 1;
-+	if(flag && h && ! h->tagged) return 1;
-+
-+	if(up)a=match_threadcomplete(flag,t->parent,1,1,1,0);
-+	if(a)return a;
-+	if(right && t->parent)a=match_threadcomplete(flag,t->next,0,0,1,1);
-+	if(a)return a;
-+	if(left && t->parent)a=match_threadcomplete(flag,t->prev,1,0,0,1);
-+	if(a)return a;
-+	if(down)a=match_threadcomplete(flag,t->child,1,0,1,1);
-+	if(a)return a;
-+	return 0;
-+}
-+
- /* flags
-    	M_MATCH_FULL_ADDRESS	match both personal and machine address */
- int
-@@ -1053,6 +1075,8 @@
-       return (pat->not ^ (h->env->x_label && regexec (pat->rx, h->env->x_label, 0, NULL, 0) == 0));
-     case M_DUPLICATED:
-       return (pat->not ^ (h->thread && h->thread->duplicate_thread));
-+    case M_THREADCOMPLETE:
-+      return ((h->thread && match_threadcomplete(pat->not,h->thread,1,1,1,1)));
-   }
-   mutt_error (_("error: unknown op %d (report this error)."), pat->op);
-   return (-1);
--- PATCHES~    Tue Nov  6 19:59:33 2001
-+++ PATCHES     Tue Nov  6 19:59:42 2001
-@@ -1,0 +1 @@
-+1.3.28.nr.threadcomplete
@@ -1,40 +0,0 @@
--- Makefile.am.orig	2014-06-01 17:46:47.000000000 +0200
-+++ Makefile.am	2014-06-01 17:48:02.000000000 +0200
-@@ -11,7 +11,7 @@
- 
- SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
- 
-bin_SCRIPTS = muttbug flea
-+bin_SCRIPTS =
- 
- BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
- 
-@@ -135,16 +135,7 @@
- 
- install-data-local: Muttrc
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
-		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
-	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
-	 	mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
-	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
-		$(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
-	fi
-	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
-		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
-	fi
-+	$(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
- 
- 
- # Don't make this one ChangeLog - it's intended to be
--- doc/Makefile.in.orig2	Thu Jan  6 15:45:57 2005
-+++ doc/Makefile.in	Thu Jan  6 15:53:52 2005
-@@ -78,8 +78,6 @@
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
- 	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
-	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
-	echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
- 	./instdoc $(srcdir)/dotlock.man \
- 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
--- a/Show More
+++ b/Show More