summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED5
-rw-r--r--audio/Makefile1
-rw-r--r--audio/muse/Makefile52
-rw-r--r--audio/muse/distinfo2
-rw-r--r--audio/muse/files/patch-Makefile.in11
-rw-r--r--audio/muse/files/patch-configure58
-rw-r--r--audio/muse/files/patch-src_Makefile.in10
-rw-r--r--audio/muse/files/patch-src_httpstream.cpp22
-rw-r--r--audio/muse/files/patch-src_jmixer.cpp40
-rw-r--r--audio/muse/files/patch-src_libmpeg_mpegtoraw.cc22
-rw-r--r--audio/muse/files/patch-src_linklist.h11
-rw-r--r--audio/muse/files/patch-src_outchannels.cpp15
-rw-r--r--audio/muse/files/patch-src_pipe.cpp14
-rw-r--r--audio/muse/files/patch-src_shout_sock.c14
-rw-r--r--audio/muse/pkg-descr8
-rw-r--r--audio/muse/pkg-plist4
-rw-r--r--math/Makefile1
-rw-r--r--math/abacus/Makefile41
-rw-r--r--math/abacus/distinfo2
-rw-r--r--math/abacus/files/patch-Include-abacus_master.h10
-rw-r--r--math/abacus/files/patch-Include-abacus_ostream.h11
-rw-r--r--math/abacus/files/patch-Include-abacus_sub.h10
-rw-r--r--math/abacus/files/patch-Include-standardpool.inc20
-rw-r--r--math/abacus/files/patch-Makefile47
-rw-r--r--math/abacus/pkg-descr24
-rw-r--r--math/abacus/pkg-plist104
-rw-r--r--net-im/Makefile2
-rw-r--r--net-im/cjc/Makefile51
-rw-r--r--net-im/cjc/distinfo2
-rw-r--r--net-im/cjc/pkg-descr6
-rw-r--r--net-im/cjc/pkg-plist97
-rw-r--r--net-im/py-pyxmpp/Makefile42
-rw-r--r--net-im/py-pyxmpp/distinfo2
-rw-r--r--net-im/py-pyxmpp/pkg-descr11
-rw-r--r--net/Makefile1
-rw-r--r--net/paris-traceroute/Makefile23
-rw-r--r--net/paris-traceroute/distinfo2
-rw-r--r--net/paris-traceroute/pkg-descr5
38 files changed, 5 insertions, 798 deletions
diff --git a/MOVED b/MOVED
index 11db1a0aed4e..533ca568b56d 100644
--- a/MOVED
+++ b/MOVED
@@ -10249,3 +10249,8 @@ net/p5-Net-Jaiku||2018-03-31|Has expired: Upstream disappeared and jaiku.com ret
www/py-django-devel|www/py-django|2018-03-31|Has expired: Outdated version. Use www/py-django instead
security/rubygem-rpam2-3|security/rubygem-rpam2|2018-03-31|Has expired: Use security/rubygem-rpam2 instead
textproc/rubygem-fast_xs073|textproc/rubygem-fast_xs|2018-03-31|Has expired: Use textproc/rubygem-fast_xs instead
+math/abacus||2018-04-03|Has expired: Unmaintained and has a broken shared library
+audio/muse||2018-04-03|Has expired: Unmaintained upstream, crashes at runtime
+net/paris-traceroute|net/scamper|2018-04-03|Has expired: Legacy paris-traceroute is not supported anymore. Use net/scamper instead
+net-im/cjc||2018-04-03|Has expired: Depends on expired net-im/py-xmpp
+net-im/py-pyxmpp||2018-04-03|Has expired: Obsoleted in favor of PyXMPP2
diff --git a/audio/Makefile b/audio/Makefile
index 77c3493c6ba8..95f523b8f522 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -552,7 +552,6 @@
SUBDIR += msilbc
SUBDIR += mumble
SUBDIR += murmur
- SUBDIR += muse
SUBDIR += musepack
SUBDIR += musescore
SUBDIR += musicbox-tag-editor
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
deleted file mode 100644
index 563783d5a8a6..000000000000
--- a/audio/muse/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Created by: ijliao
-# $FreeBSD$
-
-PORTNAME= MuSE
-PORTVERSION= 0.9.2
-PORTREVISION= 16
-CATEGORIES= audio
-MASTER_SITES= https://files.dyne.org/muse/sources/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Multiple Streaming Engine
-
-LICENSE= GPLv2+
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-DEPRECATED= Unmaintained upstream, crashes at runtime
-EXPIRATION_DATE= 2018-03-31
-
-LIB_DEPENDS= libogg.so:audio/libogg \
- libvorbis.so:audio/libvorbis
-
-OPTIONS_DEFINE= X11 LAME SNDFILE DOCS
-OPTIONS_DEFAULT=X11
-
-USES= gettext gmake
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-debug --disable-lubrify --disable-rpath
-
-CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_SYS_UIO_H
-LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lintl
-
-PORTDOCS= AUTHORS ChangeLog NEWS KNOWN-BUGS README TODO USAGE
-
-LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
-LAME_CONFIGURE_ENV= ac_cv_header_lame_lame_h=no
-SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile
-X11_USE= GNOME=gtk20
-X11_CONFIGURE_OFF= --without-x --with-rubik
-
-post-patch:
- @${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \
- ${WRKSRC}/src/portaudio/pa_unix_oss.c
-
-post-patch-SNDFILE-off:
- @${REINPLACE_CMD} -e '/sndfile >=/s|$$PKG_CONFIG|${FALSE}|' \
- ${WRKSRC}/configure
-
-post-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-
-.include <bsd.port.mk>
diff --git a/audio/muse/distinfo b/audio/muse/distinfo
deleted file mode 100644
index 7b7ebb6ae68a..000000000000
--- a/audio/muse/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (MuSE-0.9.2.tar.gz) = 270f95b3a4f9d11bea04d5db4b3868aee1fa78177da0b5d9a74f26c4cfa5e197
-SIZE (MuSE-0.9.2.tar.gz) = 1420411
diff --git a/audio/muse/files/patch-Makefile.in b/audio/muse/files/patch-Makefile.in
deleted file mode 100644
index 06a19bf2a07b..000000000000
--- a/audio/muse/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2005-12-27 13:09:38 UTC
-+++ Makefile.in
-@@ -690,7 +690,7 @@ info: info-recursive
-
- info-am:
-
--install-data-am: install-docsDATA install-man
-+install-data-am: install-man
-
- install-exec-am:
-
diff --git a/audio/muse/files/patch-configure b/audio/muse/files/patch-configure
deleted file mode 100644
index 51c9ada0c7bd..000000000000
--- a/audio/muse/files/patch-configure
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.orig 2005-12-27 13:03:15 UTC
-+++ configure
-@@ -1894,7 +1894,7 @@ uversion=`uname -r | sed -e 's/-.*$//g;s
- echo "$as_me:$LINENO: checking for which platform we are compiling" >&5
- echo $ECHO_N "checking for which platform we are compiling... $ECHO_C" >&6
- case $uname in
-- Linux)
-+ Linux|FreeBSD)
- echo "$as_me:$LINENO: result: Linux" >&5
- echo "${ECHO_T}Linux" >&6
-
-@@ -2613,16 +2613,12 @@ if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-+ CFLAGS="-g ${CFLAGS}"
- else
-- CFLAGS="-g"
-+ CFLAGS="-g ${CFLAGS}"
- fi
- else
-- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-- else
-- CFLAGS=
-- fi
-+ CFLAGS="${CFLAGS}"
- fi
- echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
- echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-@@ -3738,7 +3734,7 @@ fi
- #AM_DEFINE_UNQUOTED(HOST_CPU, "${host_cpu}")
-
- #CFLAGS="-O4 -D_REENTRANT -fomit-frame-pointer -march=${host_cpu} -ffast-math -malign-double -funroll-loops -pipe"
--CFLAGS="-pipe -D_REENTRANT"
-+#CFLAGS="-pipe -D_REENTRANT"
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -14588,7 +14584,7 @@ if test "${ac_cv_c99_lrint+set}" = set;
- else
-
- lrint_save_CFLAGS=$CFLAGS
--CFLAGS="-O2 -lm"
-+CFLAGS="${CFLAGS} -lm"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14665,7 +14661,7 @@ if test "${ac_cv_c99_lrintf+set}" = set;
- else
-
- lrintf_save_CFLAGS=$CFLAGS
--CFLAGS="-O2 -lm"
-+CFLAGS="${CFLAGS} -lm"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
diff --git a/audio/muse/files/patch-src_Makefile.in b/audio/muse/files/patch-src_Makefile.in
deleted file mode 100644
index 8f04dfe2616b..000000000000
--- a/audio/muse/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig 2005-12-27 13:09:36 UTC
-+++ src/Makefile.in
-@@ -268,7 +268,6 @@ muse_LDADD = \
- $(top_srcdir)/src/libmpeg/libmpeg.a \
- $(top_srcdir)/src/shout/libshout.a \
- $(top_srcdir)/src/portaudio/libportaudio.a \
-- -lpthread \
- @M_LIBS@ \
- @LAME_LIBS@ \
- @OGG_LIBS@ \
diff --git a/audio/muse/files/patch-src_httpstream.cpp b/audio/muse/files/patch-src_httpstream.cpp
deleted file mode 100644
index 216e106d0b41..000000000000
--- a/audio/muse/files/patch-src_httpstream.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/httpstream.cpp.orig 2005-12-27 14:26:06 UTC
-+++ src/httpstream.cpp
-@@ -356,6 +356,7 @@ http_open( const char *url )
- {
- int sock = INVALID_SOCKET;
- FILE *fd = NULL;
-+ const char *hp = NULL;
- char *host=NULL, *file=NULL, *p;
- int port = 0;
-
-@@ -363,9 +364,8 @@ http_open( const char *url )
- file = (char*)calloc( 1, strlen(url)+1 );
- if (!host || !file) goto out;
-
-- p = strstr(url, HTTP_PREFIX); if (!p) goto out;
-- p += 7;
-- strcpy(host, p);
-+ hp = strstr(url, HTTP_PREFIX); if (!hp) goto out;
-+ strcpy(host, hp + 7);
-
- p = strchr(host, '/');
- if (p) {
diff --git a/audio/muse/files/patch-src_jmixer.cpp b/audio/muse/files/patch-src_jmixer.cpp
deleted file mode 100644
index a0d82346df2f..000000000000
--- a/audio/muse/files/patch-src_jmixer.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/jmixer.cpp.orig 2004-12-16 11:04:31 UTC
-+++ src/jmixer.cpp
-@@ -20,18 +20,19 @@
- */
-
- #include <iostream>
--#include <math.h>
--#include <stdio.h>
--#include <stdlib.h>
-+#include <cmath>
-+#include <cstdio>
-+#include <cstdlib>
- #include <unistd.h>
- #include <dirent.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
--#include <errno.h>
-+#include <sys/param.h>
-+#include <cerrno>
- #include <fcntl.h>
-
--#include <string.h>
--#include <signal.h>
-+#include <cstring>
-+#include <csignal>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <termios.h>
-@@ -640,7 +641,11 @@ bool Stream_mixer::set_playmode(int ch,
- /* this is the function selecting files for the scandir
- on freebsd systems you should change the following line to:
- int selector(struct dirent *dir) { */
-+#if defined(__FreeBSD__) && __FreeBSD_version < 800501
-+int selector(struct dirent *dir) {
-+#else
- int selector(const struct dirent *dir) {
-+#endif
- if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
- #ifdef HAVE_VORBIS
- || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0
diff --git a/audio/muse/files/patch-src_libmpeg_mpegtoraw.cc b/audio/muse/files/patch-src_libmpeg_mpegtoraw.cc
deleted file mode 100644
index 5c388cf890ee..000000000000
--- a/audio/muse/files/patch-src_libmpeg_mpegtoraw.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/libmpeg/mpegtoraw.cc.orig 2003-12-08 12:20:37 UTC
-+++ src/libmpeg/mpegtoraw.cc
-@@ -9,8 +9,8 @@
- #include <pthread.h>
- #endif
-
--#include <math.h>
--#include <stdlib.h>
-+#include <cmath>
-+#include <cstdlib>
- #include <unistd.h>
-
- #include "mpegsound.h"
-@@ -419,7 +419,7 @@ bool Mpegtoraw::loadheader(void)
- return true;
- }
-
--#include <iostream.h>
-+#include <iostream>
- // Convert mpeg to raw
- bool Mpegtoraw::run(int frames) {
- clearrawdata();
diff --git a/audio/muse/files/patch-src_linklist.h b/audio/muse/files/patch-src_linklist.h
deleted file mode 100644
index 2bdc384be731..000000000000
--- a/audio/muse/files/patch-src_linklist.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/linklist.h.orig 2004-02-13 16:58:16 UTC
-+++ src/linklist.h
-@@ -44,7 +44,7 @@ class Linklist {
- bool movedown(int pos);
- bool moveto(int num, int pos);
- Entry *pick(int pos);
-- Entry *Linklist::selected();
-+ Entry *selected();
-
- Entry *operator[](int pos) { return pick(pos); };
-
diff --git a/audio/muse/files/patch-src_outchannels.cpp b/audio/muse/files/patch-src_outchannels.cpp
deleted file mode 100644
index ed61b09da1b4..000000000000
--- a/audio/muse/files/patch-src_outchannels.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/outchannels.cpp.orig 2004-12-15 18:18:06 UTC
-+++ src/outchannels.cpp
-@@ -24,11 +24,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
--#include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
diff --git a/audio/muse/files/patch-src_pipe.cpp b/audio/muse/files/patch-src_pipe.cpp
deleted file mode 100644
index d6dc5f97af0c..000000000000
--- a/audio/muse/files/patch-src_pipe.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/pipe.cpp.orig 2005-12-24 15:19:31 UTC
-+++ src/pipe.cpp
-@@ -25,9 +25,9 @@ Boston, MA 02111-1307, USA.
- */
-
- #include <iostream>
--#include <stdlib.h>
-+#include <cstdlib>
- #include <math.h>
--#include <errno.h>
-+#include <cerrno>
-
- #include <audioproc.h>
- #include <pipe.h>
diff --git a/audio/muse/files/patch-src_shout_sock.c b/audio/muse/files/patch-src_shout_sock.c
deleted file mode 100644
index 3d8a57773d94..000000000000
--- a/audio/muse/files/patch-src_shout_sock.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/shout/sock.c.orig 2004-03-29 16:04:27 UTC
-+++ src/shout/sock.c
-@@ -336,7 +336,11 @@ int sock_write_fmt(sock_t sock, const ch
- int rc = SOCK_ERROR;
- va_list ap_retry;
-
-+#if (defined(__FreeBSD__) && __FreeBSD__ < 5)
-+ ap_retry = ap;
-+#else
- va_copy (ap_retry, ap);
-+#endif
-
- len = vsnprintf (buff, sizeof (buffer), fmt, ap);
-
diff --git a/audio/muse/pkg-descr b/audio/muse/pkg-descr
deleted file mode 100644
index f923827a89a3..000000000000
--- a/audio/muse/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-MuSE is an application for the mixing, encoding, and network streaming of
-sound. MuSE can simultaneously mix up to 6 encoded audio bitstreams (from
-files or network) plus a sound card input signal. The resulting stream can
-be played locally on the sound card and/or encoded as an mp3 bitstream sent
-to a broadcast server. MuSE offers an intuitive interface to be operated
-realtime and can run in "slick" mode from command line.
-
-WWW: http://muse.dyne.org/
diff --git a/audio/muse/pkg-plist b/audio/muse/pkg-plist
deleted file mode 100644
index c10a40de9ad0..000000000000
--- a/audio/muse/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/muse
-man/man1/muse.1.gz
-share/locale/es/LC_MESSAGES/muse.mo
-share/locale/it/LC_MESSAGES/muse.mo
diff --git a/math/Makefile b/math/Makefile
index 0bb1af351bb6..0074a9237bd2 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -96,7 +96,6 @@
SUBDIR += SCIP
SUBDIR += SoPlex
SUBDIR += aamath
- SUBDIR += abacus
SUBDIR += abakus
SUBDIR += abs
SUBDIR += acalc
diff --git a/math/abacus/Makefile b/math/abacus/Makefile
deleted file mode 100644
index 73d806532722..000000000000
--- a/math/abacus/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: gahr
-# $FreeBSD$
-
-PORTNAME= abacus
-DISTVERSION= 3.2betaU1
-PORTREVISION= 9
-CATEGORIES= math
-MASTER_SITES= http://www.informatik.uni-koeln.de/abacus/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Branch-And-CUt System
-
-LICENSE= LGPL21+
-
-DEPRECATED= Unmaintained and has a broken shared library
-EXPIRATION_DATE=2018-03-31
-
-LIB_DEPENDS= libClp.so:math/coinmp
-
-NO_WRKSUBDIR= yes
-
-USES= gmake perl5
-USE_PERL5= build
-USE_LDCONFIG= yes
-ALL_TARGET= abacus
-CXXFLAGS+= -fPIC
-MAKE_ARGS= CCC="${CXX}" PERL="${PERL}" STRIP="${STRIP_CMD} -x" \
- ARCHIVE="${AR} ${ARFLAGS}" CCFLAG_DEBOPT="${CXXFLAGS}" \
- OSI_INCLUDE="${LOCALBASE}/include/coin"
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.a \
- ${STAGEDIR}${PREFIX}/lib
- ${INSTALL_LIB} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.so.1 \
- ${STAGEDIR}${PREFIX}/lib
- ${LN} -sf libabacus-osi.so.1 \
- ${STAGEDIR}${PREFIX}/lib/libabacus-osi.so
- (cd ${WRKSRC}/Include && ${COPYTREE_SHARE} abacus \
- ${STAGEDIR}${PREFIX}/include)
-
-.include <bsd.port.mk>
diff --git a/math/abacus/distinfo b/math/abacus/distinfo
deleted file mode 100644
index a3d36479b773..000000000000
--- a/math/abacus/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (abacus-3.2betaU1.tar.gz) = 149756f80de838f24af73ba30f0dfdac90495852dd40ceb6bec6043c78daf118
-SIZE (abacus-3.2betaU1.tar.gz) = 426502
diff --git a/math/abacus/files/patch-Include-abacus_master.h b/math/abacus/files/patch-Include-abacus_master.h
deleted file mode 100644
index d329d099ad26..000000000000
--- a/math/abacus/files/patch-Include-abacus_master.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- Include/abacus/master.h.orig 2014-07-28 09:34:10.000000000 +0200
-+++ Include/abacus/master.h 2014-07-28 09:38:07.000000000 +0200
-@@ -51,7 +51,6 @@
- #include "abacus/cputimer.h"
- #include "abacus/cowtimer.h"
- #include "abacus/string.h"
--#include "abacus/standardpool.h"
-
-
- class ABA_SUB;
diff --git a/math/abacus/files/patch-Include-abacus_ostream.h b/math/abacus/files/patch-Include-abacus_ostream.h
deleted file mode 100644
index d7d0168cb45a..000000000000
--- a/math/abacus/files/patch-Include-abacus_ostream.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- Include/abacus/ostream.h.orig 2010-11-19 15:47:57 UTC
-+++ Include/abacus/ostream.h
-@@ -47,7 +47,7 @@ using namespace std;
- class ABA_OSTREAM;
- ABA_OSTREAM& endl(ABA_OSTREAM &o);
- ABA_OSTREAM& flush(ABA_OSTREAM &o);
--using ::endl;
-+using std::endl;
-
- #include "abacus/abacusroot.h"
- class ABA_STRING;
diff --git a/math/abacus/files/patch-Include-abacus_sub.h b/math/abacus/files/patch-Include-abacus_sub.h
deleted file mode 100644
index 6092803d1e03..000000000000
--- a/math/abacus/files/patch-Include-abacus_sub.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- Include/abacus/sub.h.orig 2014-07-28 09:37:03.000000000 +0200
-+++ Include/abacus/sub.h 2014-07-28 09:37:19.000000000 +0200
-@@ -51,6 +51,7 @@
- #include "abacus/buffer.h"
- #include "abacus/vartype.h"
- #include "abacus/cputimer.h"
-+#include "abacus/standardpool.h"
-
- class ABA_LPSUB;
- class ABA_TAILOFF;
diff --git a/math/abacus/files/patch-Include-standardpool.inc b/math/abacus/files/patch-Include-standardpool.inc
deleted file mode 100644
index 1b9dbbd531d2..000000000000
--- a/math/abacus/files/patch-Include-standardpool.inc
+++ /dev/null
@@ -1,20 +0,0 @@
---- Include/abacus/standardpool.inc.orig 2013-11-16 14:06:39.000000000 +0100
-+++ Include/abacus/standardpool.inc 2013-11-16 14:08:30.000000000 +0100
-@@ -129,7 +129,7 @@
-
- for(int i = 0; i < ABA_POOL<BaseType, CoType>::number(); i++)
- {
-- if(softDeleteConVar(pool_[i]) == 0)
-+ if(this->softDeleteConVar(pool_[i]) == 0)
- {
- nDeleted++;
- // consider the case that a slot has been deleted although it was empty
-@@ -179,7 +179,7 @@
-
- while(nRemoved < maxRemove && !candidates.empty()) {
- c = candidates.extractMin();
-- hardDeleteConVar(pool_[c]);
-+ this->hardDeleteConVar(pool_[c]);
- nRemoved++;
- }
-
diff --git a/math/abacus/files/patch-Makefile b/math/abacus/files/patch-Makefile
deleted file mode 100644
index de0ea40901e7..000000000000
--- a/math/abacus/files/patch-Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
---- Makefile.orig 2012-01-06 13:29:04 UTC
-+++ Makefile
-@@ -177,6 +177,11 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.cc
- $(CCC) $(CCFLAGS) $(ADDFLAGS) -c $< -o $@
- $(STRIP) $@
-
-+# the shared object files
-+$(OBJDIR)/%.So: $(SRCDIR)/%.cc
-+ $(CCC) -fPIC $(CCFLAGS) $(ADDFLAGS) -c $< -o $@
-+ $(STRIP) $@
-+
-
- #######################################################################
- #
-@@ -523,15 +528,22 @@ $(LIBDIR)/stuff/interface-osi.a: $(OSI_O
- $(ARCHIVE) $@ $(OSI_O)
-
- # The basic ABACUS library
--abacus-base: $(LIBDIR)/stuff/abacus-base.a
-+abacus-base-static: $(LIBDIR)/stuff/abacus-base.a
-+abacus-base-shared: $(LIBDIR)/stuff/abacus-base.so.1
-
- $(LIBDIR)/stuff/abacus-base.a: $(ABACUS_O)
- rm -f $@
- @$(PRE_ARCHIVE) $(ABACUS_O)
- $(ARCHIVE) $@ $(ABACUS_O)
-
-+$(LIBDIR)/stuff/abacus-base.so.1: $(ABACUS_O:%.o=%.So)
-+ rm -f $@
-+ $(CCC) $(LDFLAGS) -shared -o $@ $(ABACUS_O:%.o=%.So) \
-+ `find $(LIBDIR)/temp -name \*.o | xargs -n1` \
-+ `find $(LIBDIR)/stuff -name \*.o | xargs -n1` \
-+
- # Build the library distribution directory (lib and lib/stuff)
--lib-all: subdirs abacus-base lpif interface $(ADDITIONAL_LIB_ALL)
-+lib-all: subdirs abacus-base-static abacus-base-shared lpif interface $(ADDITIONAL_LIB_ALL)
-
- # Create a tar file containing all necessary stuff to compile ABACUS on
- # a remote system.
-@@ -571,6 +583,7 @@ have_lib = $(wildcard $(LIBDIR)/libabacu
-
- abacus: lib-all
- cp $(LIBDIR)/stuff/abacus-base.a $(LIBDIR)/libabacus-osi.a
-+ cp $(LIBDIR)/stuff/abacus-base.so.1 $(LIBDIR)/libabacus-osi.so.1
- mkdir $(LIBDIR)/temp
- cd $(LIBDIR)/temp; ar x ../stuff/interface-osi.a
- find $(LIBDIR)/temp -name \*.o | xargs -n1 ar r $(LIBDIR)/libabacus-osi.a
diff --git a/math/abacus/pkg-descr b/math/abacus/pkg-descr
deleted file mode 100644
index 24fedde4c58c..000000000000
--- a/math/abacus/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-ABACUS is a software system written in C++ that provides a framework for the
-implementation of branch-and-bound algorithms using linear programming
-relaxations. Cutting planes or columns can be generated dynamically
-(branch-and-cut, branch-and-price, branch-and-cut-and-price).
-
-ABACUS allows the software developer to concentrate merely on the problem
-specific parts, i.e., the separation of cutting planes, column generation, and
-primal heuristics. ABACUS supports the Open Solver Interface (Osi) developed
-by the COIN-OR (COmputational INfrastructure for Operations Research) project
-which means that every solver supported by OSI can be used to solve the
-relaxations.
-
-Moreover, ABACUS provides a variety of general algorithmic concepts, e.g., a
-list of different enumeration and branching strategies from which the best
-alternative for the user's application can be chosen.
-
-Finally, ABACUS provides many basic data structures and useful tools for the
-implementation of such algorithms. It is designed both for general mixed
-integer optimization problems and for combinatorial optimization problems. It
-unifies cutting plane and column generation within one algorithm framework.
-Simple reuse of code and the design of abstract data structures and algorithms
-are met by object oriented programming modules.
-
-WWW: http://www.informatik.uni-koeln.de/abacus/
diff --git a/math/abacus/pkg-plist b/math/abacus/pkg-plist
deleted file mode 100644
index f2932fd4a5d8..000000000000
--- a/math/abacus/pkg-plist
+++ /dev/null
@@ -1,104 +0,0 @@
-include/abacus/abacusroot.h
-include/abacus/active.h
-include/abacus/active.inc
-include/abacus/array.h
-include/abacus/array.inc
-include/abacus/bheap.h
-include/abacus/bheap.inc
-include/abacus/boundbranchrule.h
-include/abacus/bprioqueue.h
-include/abacus/bprioqueue.inc
-include/abacus/branchrule.h
-include/abacus/bstack.h
-include/abacus/bstack.inc
-include/abacus/buffer.h
-include/abacus/buffer.inc
-include/abacus/column.h
-include/abacus/colvar.h
-include/abacus/conbranchrule.h
-include/abacus/conclass.h
-include/abacus/constraint.h
-include/abacus/convar.h
-include/abacus/cowtimer.h
-include/abacus/cputimer.h
-include/abacus/csense.h
-include/abacus/cutbuffer.h
-include/abacus/cutbuffer.inc
-include/abacus/debug.h
-include/abacus/dictionary.h
-include/abacus/dictionary.inc
-include/abacus/dlist.h
-include/abacus/dlist.inc
-include/abacus/dlistitem.h
-include/abacus/dlistitem.inc
-include/abacus/dualbound.h
-include/abacus/exceptions.h
-include/abacus/fastset.h
-include/abacus/fixcand.h
-include/abacus/fsvarstat.h
-include/abacus/global.h
-include/abacus/hash.h
-include/abacus/hash.inc
-include/abacus/history.h
-include/abacus/id.h
-include/abacus/idmap.h
-include/abacus/idmap.inc
-include/abacus/infeascon.h
-include/abacus/intset.h
-include/abacus/list.h
-include/abacus/list.inc
-include/abacus/listitem.h
-include/abacus/listitem.inc
-include/abacus/lp.h
-include/abacus/lpmaster.h
-include/abacus/lpmasterosi.h
-include/abacus/lpsolution.h
-include/abacus/lpsolution.inc
-include/abacus/lpsub.h
-include/abacus/lpsubosi.h
-include/abacus/lpvarstat.h
-include/abacus/master.h
-include/abacus/message.h
-include/abacus/mtserver.h
-include/abacus/nonduplpool.h
-include/abacus/nonduplpool.inc
-include/abacus/numcon.h
-include/abacus/numvar.h
-include/abacus/opensub.h
-include/abacus/optsense.h
-include/abacus/osiif.h
-include/abacus/osiinclude.h
-include/abacus/ostream.h
-include/abacus/parmaster.h
-include/abacus/pool.h
-include/abacus/pool.inc
-include/abacus/poolslot.h
-include/abacus/poolslot.inc
-include/abacus/poolslotref.h
-include/abacus/poolslotref.inc
-include/abacus/ring.h
-include/abacus/ring.inc
-include/abacus/row.h
-include/abacus/rowcon.h
-include/abacus/separator.h
-include/abacus/separator.inc
-include/abacus/set.h
-include/abacus/setbranchrule.h
-include/abacus/slackstat.h
-include/abacus/sorter.h
-include/abacus/sorter.inc
-include/abacus/sparvec.h
-include/abacus/srowcon.h
-include/abacus/standardpool.h
-include/abacus/standardpool.inc
-include/abacus/string.h
-include/abacus/sub.h
-include/abacus/subserver.h
-include/abacus/tailoff.h
-include/abacus/timer.h
-include/abacus/valbranchrule.h
-include/abacus/variable.h
-include/abacus/vartype.h
-lib/libabacus-osi.a
-lib/libabacus-osi.so
-lib/libabacus-osi.so.1
diff --git a/net-im/Makefile b/net-im/Makefile
index 881e0fe0795c..7d09a31ba4b9 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -6,7 +6,6 @@
SUBDIR += centerim
SUBDIR += centerim-devel
SUBDIR += chattahoochie
- SUBDIR += cjc
SUBDIR += climm
SUBDIR += coccinella
SUBDIR += convey
@@ -138,7 +137,6 @@
SUBDIR += py-nbxmpp
SUBDIR += py-punjab
SUBDIR += py-python-telegram-bot
- SUBDIR += py-pyxmpp
SUBDIR += py-skype4py
SUBDIR += py-slackclient
SUBDIR += py-sleekxmpp
diff --git a/net-im/cjc/Makefile b/net-im/cjc/Makefile
deleted file mode 100644
index 13140686ec06..000000000000
--- a/net-im/cjc/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= cjc
-PORTVERSION= 1.2.1
-PORTREVISION= 1
-CATEGORIES= net-im python
-MASTER_SITES= GHC
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Console Jabber Client
-
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-DEPRECATED= Depends on expired net-im/py-xmpp
-EXPIRATION_DATE=2018-04-01
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:net-im/py-pyxmpp@${PY_FLAVOR}
-
-USES= python:2.7 shebangfix
-SHEBANG_FILES= cjc.in cjc.py cjc/main.py
-NO_ARCH= yes
-
-USE_GITHUB= yes
-GH_ACCOUNT= Jajcus
-
-PORTDOCS= *
-
-OPTIONS_DEFINE= DOCS
-
-post-patch:
- @${REINPLACE_CMD} -e \
- 's|prefix=.*|prefix=${PREFIX}|; \
- s|$$(INSTALL_DIR) $$(DESTDIR)$$(pkg_docdir)||; \
- s|$$(INSTALL_DATA) $$(DOCS) $$(DESTDIR)$$(pkg_docdir)||; \
- s|INSTALL=.*|INSTALL=${INSTALL}|; \
- s|INSTALL_DATA=.*|INSTALL_DATA=${INSTALL_DATA}|; \
- s|^INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|; \
- /compileall/d' ${WRKSRC}/Makefile
-
-post-install:
- (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
- -d ${PREFIX} -f ${DATADIR_REL})
-
-post-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/README \
- ${WRKSRC}/doc/manual.html ${STAGEDIR}${DOCSDIR}/
-
-.include <bsd.port.mk>
diff --git a/net-im/cjc/distinfo b/net-im/cjc/distinfo
deleted file mode 100644
index 3e2834fcbf8c..000000000000
--- a/net-im/cjc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cjc-1.2.1.tar.gz) = 8dcfb6969576b16d4ee6d8191751dea118dd9fd9efdba6ce524a6dcfb9196606
-SIZE (cjc-1.2.1.tar.gz) = 152563
diff --git a/net-im/cjc/pkg-descr b/net-im/cjc/pkg-descr
deleted file mode 100644
index 25bf350d6d2a..000000000000
--- a/net-im/cjc/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-CJC is a Jabber/XMPP client for text terminals. It uses pyxmpp
-library for XMPP comunication and curses for screen output. It
-is not finished yet, but still quite usable. Its user interface
-is resembling those of popular IRC clients like irssi or BitchX.
-
-WWW: http://cjc.jajcus.net/
diff --git a/net-im/cjc/pkg-plist b/net-im/cjc/pkg-plist
deleted file mode 100644
index da512cccb798..000000000000
--- a/net-im/cjc/pkg-plist
+++ /dev/null
@@ -1,97 +0,0 @@
-bin/cjc
-%%DATADIR%%/cjc/__init__.py
-%%DATADIR%%/cjc/__init__.pyc
-%%DATADIR%%/cjc/cjc_globals.py
-%%DATADIR%%/cjc/cjc_globals.pyc
-%%DATADIR%%/cjc/cjclogging.py
-%%DATADIR%%/cjc/cjclogging.pyc
-%%DATADIR%%/cjc/common.py
-%%DATADIR%%/cjc/common.pyc
-%%DATADIR%%/cjc/completions.py
-%%DATADIR%%/cjc/completions.pyc
-%%DATADIR%%/cjc/main.py
-%%DATADIR%%/cjc/main.pyc
-%%DATADIR%%/cjc/plugin.py
-%%DATADIR%%/cjc/plugin.pyc
-%%DATADIR%%/cjc/plugins.py
-%%DATADIR%%/cjc/plugins.pyc
-%%DATADIR%%/cjc/themes.py
-%%DATADIR%%/cjc/themes.pyc
-%%DATADIR%%/cjc/tls.py
-%%DATADIR%%/cjc/tls.pyc
-%%DATADIR%%/cjc/ui/__init__.py
-%%DATADIR%%/cjc/ui/__init__.pyc
-%%DATADIR%%/cjc/ui/bool_input.py
-%%DATADIR%%/cjc/ui/bool_input.pyc
-%%DATADIR%%/cjc/ui/buffer.py
-%%DATADIR%%/cjc/ui/buffer.pyc
-%%DATADIR%%/cjc/ui/choice_input.py
-%%DATADIR%%/cjc/ui/choice_input.pyc
-%%DATADIR%%/cjc/ui/cmdtable.py
-%%DATADIR%%/cjc/ui/cmdtable.pyc
-%%DATADIR%%/cjc/ui/complete.py
-%%DATADIR%%/cjc/ui/complete.pyc
-%%DATADIR%%/cjc/ui/form_buffer.py
-%%DATADIR%%/cjc/ui/form_buffer.pyc
-%%DATADIR%%/cjc/ui/input.py
-%%DATADIR%%/cjc/ui/input.pyc
-%%DATADIR%%/cjc/ui/input_widget.py
-%%DATADIR%%/cjc/ui/input_widget.pyc
-%%DATADIR%%/cjc/ui/keytable.py
-%%DATADIR%%/cjc/ui/keytable.pyc
-%%DATADIR%%/cjc/ui/list_buffer.py
-%%DATADIR%%/cjc/ui/list_buffer.pyc
-%%DATADIR%%/cjc/ui/list_input.py
-%%DATADIR%%/cjc/ui/list_input.pyc
-%%DATADIR%%/cjc/ui/screen.py
-%%DATADIR%%/cjc/ui/screen.pyc
-%%DATADIR%%/cjc/ui/split.py
-%%DATADIR%%/cjc/ui/split.pyc
-%%DATADIR%%/cjc/ui/status_bar.py
-%%DATADIR%%/cjc/ui/status_bar.pyc
-%%DATADIR%%/cjc/ui/text_buffer.py
-%%DATADIR%%/cjc/ui/text_buffer.pyc
-%%DATADIR%%/cjc/ui/text_input.py
-%%DATADIR%%/cjc/ui/text_input.pyc
-%%DATADIR%%/cjc/ui/widget.py
-%%DATADIR%%/cjc/ui/widget.pyc
-%%DATADIR%%/cjc/ui/window.py
-%%DATADIR%%/cjc/ui/window.pyc
-%%DATADIR%%/cjc/version.py
-%%DATADIR%%/cjc/version.pyc
-%%DATADIR%%/plugins/chat.py
-%%DATADIR%%/plugins/chat.pyc
-%%DATADIR%%/plugins/disco.py
-%%DATADIR%%/plugins/disco.pyc
-%%DATADIR%%/plugins/events.py
-%%DATADIR%%/plugins/events.pyc
-%%DATADIR%%/plugins/file_logger.py
-%%DATADIR%%/plugins/file_logger.pyc
-%%DATADIR%%/plugins/jogger_pl.py
-%%DATADIR%%/plugins/jogger_pl.pyc
-%%DATADIR%%/plugins/message.py
-%%DATADIR%%/plugins/message.pyc
-%%DATADIR%%/plugins/muc.py
-%%DATADIR%%/plugins/muc.pyc
-%%DATADIR%%/plugins/multicast.py
-%%DATADIR%%/plugins/multicast.pyc
-%%DATADIR%%/plugins/presence.py
-%%DATADIR%%/plugins/presence.pyc
-%%DATADIR%%/plugins/python.py
-%%DATADIR%%/plugins/python.pyc
-%%DATADIR%%/plugins/roster.py
-%%DATADIR%%/plugins/roster.pyc
-%%DATADIR%%/plugins/roster_ei.py
-%%DATADIR%%/plugins/roster_ei.pyc
-%%DATADIR%%/plugins/shell.py
-%%DATADIR%%/plugins/shell.pyc
-%%DATADIR%%/plugins/sqlite_archive.py
-%%DATADIR%%/plugins/sqlite_archive.pyc
-%%DATADIR%%/plugins/test.py
-%%DATADIR%%/plugins/test.pyc
-%%DATADIR%%/plugins/vcard.py
-%%DATADIR%%/plugins/vcard.pyc
-%%DATADIR%%/plugins/version.py
-%%DATADIR%%/plugins/version.pyc
-%%DATADIR%%/plugins/xmlconsole.py
-%%DATADIR%%/plugins/xmlconsole.pyc
diff --git a/net-im/py-pyxmpp/Makefile b/net-im/py-pyxmpp/Makefile
deleted file mode 100644
index 51907c53db8c..000000000000
--- a/net-im/py-pyxmpp/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Created by: Vsevolod Stakhov <vsevolod@highsecure.ru>
-# $FreeBSD$
-
-PORTNAME= pyxmpp
-PORTVERSION= 1.1.2
-PORTREVISION= 3
-CATEGORIES= net-im python
-MASTER_SITES= GHC
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Python XMPP library
-
-LICENSE= LGPL21 # only
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-DEPRECATED= Obsoleted in favor of PyXMPP2
-EXPIRATION_DATE= 2018-02-28
-
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:security/py-m2crypto@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${FLAVOR}
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
-USE_GITHUB= yes
-GH_ACCOUNT= Jajcus
-
-USES= python:2.7 shebangfix
-SHEBANG_FILES= auxtools/*.py examples/*.py tests/*.py utils/*.py
-USE_PYTHON= distutils autoplist
-
-post-patch:
- @${REINPLACE_CMD} -e \
- "/include_dirs =/s|\[.*|['${LOCALBASE}/include/libxml2','${LOCALBASE}/include']| ; \
- /library_dirs =/s|\[.*|['${LOCALBASE}/lib']|" ${WRKSRC}/setup.py
-
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyxmpp/_xmlextra.so
-
-.include <bsd.port.mk>
diff --git a/net-im/py-pyxmpp/distinfo b/net-im/py-pyxmpp/distinfo
deleted file mode 100644
index 5aa526d77768..000000000000
--- a/net-im/py-pyxmpp/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pyxmpp-1.1.2.tar.gz) = f45365bae922a9e44226622cf086e3ffd3c681012f6c6b609d3306e4d0dfb33c
-SIZE (pyxmpp-1.1.2.tar.gz) = 1110893
diff --git a/net-im/py-pyxmpp/pkg-descr b/net-im/py-pyxmpp/pkg-descr
deleted file mode 100644
index b2e3809fed8c..000000000000
--- a/net-im/py-pyxmpp/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-PyXMPP is a Python XMPP (RFC 3920,3921) and Jabber
-implementation. It is based on libxml2 -- fast and
-fully-featured XML parser.
-
-PyXMPP provides most core features of the XMPP protocol and
-several JSF-defined extensions. PyXMPP provides building
-blocks for creating Jabber clients and components. Developer
-uses them to setup XMPP streams, handle incoming events and
-create outgoing stanzas (XMPP "packets").
-
-WWW: http://pyxmpp.jajcus.net/
diff --git a/net/Makefile b/net/Makefile
index c43a17d92dca..90324db1bf7e 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -868,7 +868,6 @@
SUBDIR += packetdrill
SUBDIR += packter-agent
SUBDIR += panoptis
- SUBDIR += paris-traceroute
SUBDIR += passlogd
SUBDIR += pathneck
SUBDIR += pbnc
diff --git a/net/paris-traceroute/Makefile b/net/paris-traceroute/Makefile
deleted file mode 100644
index 9710afdf615a..000000000000
--- a/net/paris-traceroute/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: dikshie@sfc.wide.ad.jp
-# $FreeBSD$
-
-PORTNAME= paris-traceroute
-PORTVERSION= 0.92
-PORTREVISION= 1
-CATEGORIES= net
-MASTER_SITES= http://paris-traceroute.net/downloads/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-dev
-
-MAINTAINER= dikshie@sfc.wide.ad.jp
-COMMENT= Paris traceroute is network diagnosis and measurement tools
-
-DEPRECATED= Legacy paris-traceroute is not supported anymore. Use net/scamper instead
-EXPIRATION_DATE=2018-03-31
-
-GNU_CONFIGURE= yes
-USES= gmake
-WRKSRC= ${WRKDIR}/${PORTNAME}-current
-
-PLIST_FILES= bin/paris-traceroute
-
-.include <bsd.port.mk>
diff --git a/net/paris-traceroute/distinfo b/net/paris-traceroute/distinfo
deleted file mode 100644
index f6ded556e260..000000000000
--- a/net/paris-traceroute/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (paris-traceroute-0.92-dev.tar.gz) = 93f05a7f27374bd9b2dd474963679fffeee947642dd1c8478afc7cb72fbb4cbe
-SIZE (paris-traceroute-0.92-dev.tar.gz) = 1063191
diff --git a/net/paris-traceroute/pkg-descr b/net/paris-traceroute/pkg-descr
deleted file mode 100644
index 8fb8bff84df7..000000000000
--- a/net/paris-traceroute/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Paris traceroute is a new version of the well-known network diagnosis
-and measurement tool. It addresses problems caused by load balancers
-with the initial implementation of traceroute.
-
-WWW: http://paris-traceroute.net/