Remove expired ports:

2016-02-29 audio/audacious-dumb: Broken for more than 6 months 2016-02-29 net/ntopng: Broken for more than 6 months 2016-02-29 audio/rezound: Broken for more than 6 months 2016-02-29 net/rubygem-amqp067: Upstream prefers net/rubygem-bunny 2016-02-29 devel/py-unittestplus: Tarballs and upstream website disappeared
svn path=/head/; revision=409828
2016-02-29 21:24:24 +00:00 · 2016-02-29 21:24:24 +00:00 · 7ae11cf915 · 2021-03-31 03:12:20 +00:00
commit 7ae11cf915
parent 8140c328dd
36 changed files with 5 additions and 1439 deletions
--- a/5
+++ b/5
@ -8206,3 +8206,8 @@ www/php5-tidy||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versio
 mail/pronto||2016-02-18|No release since 2002 http://www.muhri.net/pronto/page.php3?node=news
 russian/muttprint||2016-02-25|The Russian translation is included in print/muttprint
 security/openssh-portable-devel|security/openssh-portable|2016-02-29|Outdated and insecure, use the main port.
+audio/audacious-dumb||2016-02-29|Has expired: Broken for more than 6 months
+net/ntopng||2016-02-29|Has expired: Broken for more than 6 months
+audio/rezound||2016-02-29|Has expired: Broken for more than 6 months
+net/rubygem-amqp067|net/rubygem-bunny|2016-02-29|Has expired: Upstream prefers net/rubygem-bunny
+devel/py-unittestplus||2016-02-29|Has expired: Tarballs and upstream website disappeared
--- a/audio/Makefile
+++ b/audio/Makefile
@ -35,7 +35,6 @@
    SUBDIR += asunder
    SUBDIR += atunes
    SUBDIR += aubio
-    SUBDIR += audacious-dumb
    SUBDIR += audacity
    SUBDIR += audex
    SUBDIR += audiere
@ -650,7 +649,6 @@
    SUBDIR += rem
    SUBDIR += resid
    SUBDIR += rexima
-    SUBDIR += rezound
    SUBDIR += rhythmbox
    SUBDIR += rio500
    SUBDIR += rioutil
--- a/audio/audacious-dumb/Makefile
+++ b/audio/audacious-dumb/Makefile
@ -1,32 +0,0 @@
-# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	audacious-dumb
-PORTVERSION=	0.83
-PORTREVISION=	1
-CATEGORIES=	audio
-MASTER_SITES=	http://www.netswarm.net/misc/ \
-		LOCAL/ehaupt
-
-MAINTAINER=	ehaupt@FreeBSD.org
-COMMENT=	Audacious plugin that support the IT, XM, S3M, or MOD formats
-
-LICENSE=	GPLv2
-
-RUN_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
-BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious \
-		${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb
-
-BROKEN=		Does not compile with audacious 3.6.x.
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-02-29
-USES=		gmake pkgconfig
-USE_LDCONFIG=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Makefile
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/audacious/Input/dumb.so
-
-.include <bsd.port.mk>
--- a/audio/audacious-dumb/distinfo
+++ b/audio/audacious-dumb/distinfo
@ -1,2 +0,0 @@
-SHA256 (audacious-dumb-0.83.tar.gz) = c9d218228b2dcbbbaea12b0ff8e1782d0fe5b7b8028fccd0f946db3c6b05517c
-SIZE (audacious-dumb-0.83.tar.gz) = 19325
--- a/audio/audacious-dumb/pkg-descr
+++ b/audio/audacious-dumb/pkg-descr
@ -1,4 +0,0 @@
-Audacious Input Plugin that supports the DUMB MODPlaying engine. It supports
-the IT, XM, S3M and MOD audio format.
-
-WWW: http://www.netswarm.net
--- a/audio/audacious-dumb/pkg-plist
+++ b/audio/audacious-dumb/pkg-plist
@ -1 +0,0 @@
-lib/audacious/Input/dumb.so
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@ -1,117 +0,0 @@
-# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	rezound
-DISTVERSION=	0.12.3beta
-PORTREVISION=	23
-CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME}/ReZound/${DISTVERSION}
-
-MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	Graphical audio file editor
-
-LICENSE=	GPLv2
-
-BROKEN=		Fails to configure with gcc, fails to link with clang
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-02-29
-
-LIB_DEPENDS=	libFOX-1.4.so:${PORTSDIR}/x11-toolkits/fox14
-
-USES=		bison
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-LIBS+=		-lX11
-CONFIGURE_ARGS=	--disable-alsa
-MAKE_JOBS_UNSAFE=	yes
-CONFIGURE_ENV=	ac_cv_path_RESWRAP=${LOCALBASE}/bin/fox-1.4/reswrap
-
-OPTIONS_DEFINE=	LARGEFILE JACK AUDIOFILE PORTAUDIO OGG VORBIS FLAC FFTW \
-		SOUNDTOUCH LADSPA LAME CDRDAO DOCS BROKEN_NLS
-OPTIONS_DEFAULT=	AUDIOFILE PORTAUDIO OGG VORBIS FLAC SOUNDTOUCH \
-		LADSPA LAME
-
-LARGEFILE_DESC=	Use 64-bit file I/O
-FFTW_DESC=	Use fast Fourier transform routines
-CDRDAO_DESC=	Burning audio files to CD support
-BROKEN_NLS_DESC=	${NLS_DESC} (broken!)
-
-LARGEFILE_CONFIGURE_ON=	--enable-largefile
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
-AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
-OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
-FFTW_LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw
-SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
-LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
-LADSPA_CONFIGURE_OFF=	--disable-ladspa
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-CDRDAO_RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
-
-EXTRA_PATCHES=		${FILESDIR}/050_all_portaudio19.patch:-p1
-
-.include <bsd.port.options.mk>
-
-# NLS support is broken as of recent versions of libstdc++; rezound dies at
-# startup with "locale::facet::_S_create_c_locale name not valid" exception
-.if ${PORT_OPTIONS:MBROKEN_NLS}	# Enable only if you know what you're doing
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPORTAUDIO}
-LIBS+=	-lportaudio
-.endif
-
-post-patch: .SILENT
-	${REINPLACE_CMD} -E '/atoll|round|nearbyint/d' \
-		${WRKSRC}/config/platform/bsd.h
-	${REINPLACE_CMD} -E 's,(_nl_expand_alias \()\),\1...), ; \
-		/^C(XX)?FLAGS=/d ; /CXXFLAGS="\$$CXXFLAGS -[gW]/d ; \
-		/^return /s,\(int\)( n?gettext),(long)\1,' \
-			${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's,WORDS_BIGENDIN,WORDS_BIGENDIAN,' \
-		${WRKSRC}/src/backend/COSSSoundPlayer.cpp
-	${REINPLACE_CMD} -e 's,$$(prefix)/doc,$$(datadir)/doc,' \
-		${WRKSRC}/config/am_include.mk ${WRKSRC}/Makefile.in \
-		${WRKSRC}/src/Makefile.in ${WRKSRC}/src/misc/Makefile.in \
-		${WRKSRC}/src/misc/CNestedDataFile/Makefile.in \
-		${WRKSRC}/src/PoolFile/Makefile.in \
-		${WRKSRC}/src/backend/DSP/Makefile.in \
-		${WRKSRC}/src/backend/Makefile.in \
-		${WRKSRC}/src/backend/File/Makefile.in \
-		${WRKSRC}/src/backend/Edits/Makefile.in \
-		${WRKSRC}/src/backend/Effects/Makefile.in \
-		${WRKSRC}/src/backend/Filters/Makefile.in \
-		${WRKSRC}/src/backend/Looping/Makefile.in \
-		${WRKSRC}/src/backend/Generate/Makefile.in \
-		${WRKSRC}/src/backend/Remaster/Makefile.in \
-		${WRKSRC}/src/backend/LADSPA/Makefile.in \
-		${WRKSRC}/src/frontend_fox/Makefile.in
-# Fix some sloppy C++ coding which upsets Clang
-	${REINPLACE_CMD} -e '/&string_to_anytype/s,static ,,' \
-		${WRKSRC}/src/misc/CNestedDataFile/anytype.h
-	${REINPLACE_CMD} -e 's,push_back((,this->&,' \
-		${WRKSRC}/src/misc/auto_array.h
-	${REINPLACE_CMD} -e 's,overflowWrite(,this->&,' \
-		${WRKSRC}/src/PoolFile/TPoolAccesser.cpp
-	${REINPLACE_CMD} -e 's,map<string,map<const string,' \
-		${WRKSRC}/src/PoolFile/TPoolFile.cpp
-.if ${PORT_OPTIONS:MDOCS}
-	${REINPLACE_CMD} -e '/AUTHORS/d; /COPYING/d' ${WRKSRC}/Makefile.in
-.else
-	${REINPLACE_CMD} -e 's/ install-pkgdocDATA$$//' ${WRKSRC}/Makefile.in
-.endif
-
-.if ${PORT_OPTIONS:MPORTAUDIO}
-post-configure:
-	${ECHO_CMD} "#define ENABLE_PORTAUDIO_V19 1" >> ${WRKSRC}/config/config.h
-.endif
-
-.include <bsd.port.mk>
--- a/audio/rezound/distinfo
+++ b/audio/rezound/distinfo
@ -1,2 +0,0 @@
-SHA256 (rezound-0.12.3beta.tar.gz) = 9a895f7011048df3485c9ab29b6abf3c4ac8eb4b8842164c42e34b8f0b76426f
-SIZE (rezound-0.12.3beta.tar.gz) = 1792882
--- a/audio/rezound/files/050_all_portaudio19.patch
+++ b/audio/rezound/files/050_all_portaudio19.patch
@ -1,196 +0,0 @@
-Index: rezound-0.12.3beta/configure.ac
-===================================================================
--- rezound-0.12.3beta.orig/configure.ac
-+++ rezound-0.12.3beta/configure.ac
-@@ -372,13 +372,22 @@ AC_ARG_ENABLE(
- 
- # handle the --enable-portaudio flag
- AH_TEMPLATE(ENABLE_PORTAUDIO)
-+AH_TEMPLATE(ENABLE_PORTAUDIO_V19)
- if test -z "$enable_standalone"; then
- 	AC_ARG_ENABLE(
- 		portaudio,
- 		AC_HELP_STRING([--enable/disable-portaudio],[enable/disable ReZound to use PortAudio for audio I/O]),
- 		[
- 			if [[ "$enableval" = "yes" ]]
-			then 
-+			then
-+				PKG_CHECK_MODULES(PORTAUDIO_19,portaudio-2.0 >= 0.21 ,[portaudio_v19=yes],:)
-+				if test "x$portaudio_v19" = "xyes"; then
-+					AC_DEFINE(ENABLE_PORTAUDIO)
-+					AC_DEFINE(ENABLE_PORTAUDIO_V19)
-+					LIBS="$LIBS $PORTAUDIO_19_LIBS"
-+					AC_MSG_RESULT([*** enabling libportaudio v19 for audio I/O])
-+					using_portaudio=1
-+				else
- 				# --enable-portaudio was given
- 				# Require that the portaudio library can be found
- 				AC_CHECK_LIB(
-@@ -404,12 +413,21 @@ if test -z "$enable_standalone"; then
- 
- 					AC_MSG_ERROR([***** libportaudio.a not found (http://www.portaudio.com) *****])
- 				)
-+				fi
- 			else
- 				AC_MSG_RESULT([*** disabling libportaudio for audio I/O])
- 			fi
- 		],
- 		[ # action if neither enable or disable flag was given
- 			# if libportaudio and portaudio.h are found, then enable it
-+			PKG_CHECK_MODULES(PORTAUDIO_19,portaudio-2.0 >= 0.21 ,[portaudio_v19=yes],:)
-+			if test "x$portaudio_v19" = "xyes"; then
-+				AC_DEFINE(ENABLE_PORTAUDIO)
-+				AC_DEFINE(ENABLE_PORTAUDIO_V19)
-+				LIBS="$LIBS $PORTAUDIO_19_LIBS"
-+				AC_MSG_RESULT([*** enabling libportaudio v19 for audio I/O])
-+				using_portaudio=1
-+			else
- 			AC_CHECK_LIB(
- 				portaudio,
- 				Pa_Initialize,
-@@ -430,6 +448,7 @@ if test -z "$enable_standalone"; then
- 					]
- 				)]
- 			)
-+			fi
- 		]
- 	)
- else
-Index: rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.cpp
-===================================================================
--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundPlayer.cpp
-+++ rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.cpp
-@@ -70,6 +70,24 @@ void CPortAudioSoundPlayer::initialize()
- 		
- 
- 		// open a PortAudio stream
-+#ifdef ENABLE_PORTAUDIO_V19
-+		PaStreamParameters output = { gPortAudioOutputDevice, 
-+			gDesiredOutputChannelCount, 
-+			sampleFormat,
-+			Pa_GetDeviceInfo(gPortAudioOutputDevice)->defaultLowOutputLatency ,
-+			NULL};
-+
-+		err = Pa_OpenStream(
-+				&stream,
-+				NULL,
-+				&output,
-+				gDesiredOutputSampleRate,
-+				gDesiredOutputBufferSize * gDesiredOutputBufferCount,
-+				paClipOff|paDitherOff,
-+				CPortAudioSoundPlayer::PortAudioCallback,
-+				this);
-+
-+#else
- 		err = Pa_OpenStream(
- 			&stream,
- 			paNoDevice,			/* recording parameter, we're not recording */
-@@ -86,6 +104,7 @@ void CPortAudioSoundPlayer::initialize()
- 			paClipOff|paDitherOff,
- 			CPortAudioSoundPlayer::PortAudioCallback,
- 			this);
-+#endif
- 
- 		if(err!=paNoError) 
- 			throw runtime_error(string(__func__)+" -- error opening PortAudio stream -- "+Pa_GetErrorText(err));
-@@ -156,7 +175,11 @@ void CPortAudioSoundPlayer::doneRecordin
- }
- 
- 
-+#ifdef ENABLE_PORTAUDIO_V19
-+int CPortAudioSoundPlayer::PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData)
-+#else
- int CPortAudioSoundPlayer::PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData)
-+#endif
- {
- 	try
- 	{
-Index: rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.h
-===================================================================
--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundPlayer.h
-+++ rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.h
-@@ -45,10 +45,14 @@ public:
- 
- private:
- 	bool initialized;
-	PortAudioStream *stream;
-+	PaStream *stream;
- 	bool supportsFullDuplex;
- 
-+#ifdef ENABLE_PORTAUDIO_V19
-+	static int PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData);
-+#else
- 	static int PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData);
-+#endif
- 
- };
- 
-Index: rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.cpp
-===================================================================
--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundRecorder.cpp
-+++ rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.cpp
-@@ -65,6 +65,24 @@ void CPortAudioSoundRecorder::initialize
- 		ASoundRecorder::initialize(sound);
- 
- 		// open a PortAudio stream
-+#ifdef ENABLE_PORTAUDIO_V19
-+		PaStreamParameters input = { 
-+                        gPortAudioOutputDevice, 
-+                        sound->getChannelCount(), 
-+                        sampleFormat, 
-+                        Pa_GetDeviceInfo(gPortAudioOutputDevice)->defaultLowInputLatency ,
-+                        NULL};
-+		err = Pa_OpenStream(
-+			&stream,
-+			&input,
-+			NULL,
-+			sound->getSampleRate(),
-+			BUFFER_SIZE_FRAMES*12,
-+			paClipOff|paDitherOff,
-+			CPortAudioSoundRecorder::PortAudioCallback,
-+			this);
-+
-+#else
- 		err = Pa_OpenStream(
- 			&stream,
- 			gPortAudioOutputDevice,
-@@ -81,6 +99,7 @@ void CPortAudioSoundRecorder::initialize
- 			paClipOff|paDitherOff,
- 			CPortAudioSoundRecorder::PortAudioCallback,
- 			this);
-+#endif
- 
- 		if(err!=paNoError) 
- 			throw runtime_error(string(__func__)+" -- error opening PortAudio stream -- "+Pa_GetErrorText(err));
-@@ -131,7 +150,11 @@ void CPortAudioSoundRecorder::redo()
- 	Pa_StartStream(stream);
- }
- 
-+#ifdef ENABLE_PORTAUDIO_V19
-+int CPortAudioSoundRecorder::PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData)
-+#else
- int CPortAudioSoundRecorder::PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData)
-+#endif
- {
- 	try
- 	{
-Index: rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.h
-===================================================================
--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundRecorder.h
-+++ rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.h
-@@ -42,10 +42,14 @@ public:
- 	void redo();
- 
- private:
-	PortAudioStream *stream;
-+	PaStream *stream;
- 	bool initialized;
- 
-+#ifdef ENABLE_PORTAUDIO_V19
-+	static int PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData);
-+#else
- 	static int PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData);
-+#endif
- };
- 
- #endif // ENABLE_PORTAUDIO
--- a/audio/rezound/files/patch-64bit-fixes
+++ b/audio/rezound/files/patch-64bit-fixes
@ -1,78 +0,0 @@
--- src/frontend_fox/CMainWindow.cpp.orig	2007-01-14 05:48:07.000000000 +0600
-+++ src/frontend_fox/CMainWindow.cpp	2011-07-10 00:43:26.743617695 +0700
-@@ -438,7 +438,7 @@
- 
- long CMainWindow::onSoundListChange(FXObject *sender,FXSelector sel,void *ptr)
- {
-	FXint index=(FXint)ptr;
-+	FXint index=(uintptr_t)ptr;
- 
- 	if(index>=0 && index<soundList->getNumItems())
- 	{
-@@ -1853,13 +1853,13 @@
- 
- 	if(pos==0 && FXSELID(sel)==ID_SHUTTLE_BACKWARD)
- 	{
-		if((unsigned)ptr > 1/*came from keyboard event*/) enableAutoRepeat(getApp()->getDisplay(),false); // QQQ
-+		if((uintptr_t)ptr > 1/*came from keyboard event*/) enableAutoRepeat(getApp()->getDisplay(),false); // QQQ
- 		shuttleDial->setValue(pos-inc);
- 		onShuttleChange(sender,sel,ptr);
- 	}
- 	else if(pos==0 && FXSELID(sel)==ID_SHUTTLE_FORWARD)
- 	{
-		if((unsigned)ptr > 1/*came from keyboard event*/) enableAutoRepeat(getApp()->getDisplay(),false); // QQQ
-+		if((uintptr_t)ptr > 1/*came from keyboard event*/) enableAutoRepeat(getApp()->getDisplay(),false); // QQQ
- 		shuttleDial->setValue(pos+inc);
- 		onShuttleChange(sender,sel,ptr);
- 	}
--- src/frontend_fox/CMp3Dialog.cpp.orig	2004-06-19 10:53:18.000000000 +0700
-+++ src/frontend_fox/CMp3Dialog.cpp	2011-07-10 00:28:06.789412062 +0700
-@@ -170,7 +170,7 @@
- 
- long CMp3Dialog::onRadioButton(FXObject *sender,FXSelector sel,void *ptr)
- {
-	if((int)ptr==0) // only act when ptr==1 when it's getting checked
-+	if(ptr==0) // only act when ptr==1 when it's getting checked
- 		return 1;
- 
- 	// turn off all buttons
--- src/frontend_fox/COggDialog.cpp.orig	2004-02-11 11:11:17.000000000 +0600
-+++ src/frontend_fox/COggDialog.cpp	2011-07-10 00:27:51.332341401 +0700
-@@ -136,7 +136,7 @@
- 
- long COggDialog::onRadioButton(FXObject *sender,FXSelector sel,void *ptr)
- {
-	if((int)ptr==0) // only act when ptr==1 when it's getting checked
-+	if(ptr==0) // only act when ptr==1 when it's getting checked
- 		return 1;
- 
- 	// turn off all buttons
--- src/frontend_fox/CPasteChannelsDialog.cpp.orig	2005-02-09 14:17:36.000000000 +0600
-+++ src/frontend_fox/CPasteChannelsDialog.cpp	2011-07-10 00:26:51.192066310 +0700
-@@ -206,7 +206,7 @@
- 	{
- 		pasteChannels.clear();
- 
-		actionParameters->setValue<unsigned>(_("MixMethod"),(unsigned)(mixTypeComboBox->getItemData(mixTypeComboBox->getCurrentItem())));
-+		actionParameters->setValue<unsigned>(_("MixMethod"),(uintptr_t)(mixTypeComboBox->getItemData(mixTypeComboBox->getCurrentItem())));
- 		
- 		if(repeatTypeComboBox->getCurrentItem()==0)
- 		{ // repeating it a given number of times
--- src/misc/AThread.h.orig	2003-07-09 01:31:57.000000000 +0700
-+++ src/misc/AThread.h	2011-07-10 00:14:55.142793847 +0700
-@@ -131,13 +131,13 @@
- 		catch(exception &e)
- 		{
- 			thread->running=false;
-			fprintf(stderr,"exception was thrown within thread -- ID: 0x%x;\nmessage: %s\naborting\n",(unsigned)thread->threadID,e.what());fflush(stderr);
-+			fprintf(stderr,"exception was thrown within thread -- ID: 0x%p;\nmessage: %s\naborting\n",thread->threadID,e.what());fflush(stderr);
- 			abort();
- 		}
- 		catch(...)
- 		{
- 			thread->running=false;
-			fprintf(stderr,"unhandled exception was thrown within thread -- ID: 0x%x; aborting\n",(unsigned)thread->threadID);fflush(stderr);
-+			fprintf(stderr,"unhandled exception was thrown within thread -- ID: 0x%p; aborting\n",thread->threadID);fflush(stderr);
- 			abort();
- 		}
- 		return(NULL);
--- a/audio/rezound/files/patch-fix-raw-save
+++ b/audio/rezound/files/patch-fix-raw-save
@ -1,78 +0,0 @@
--- src/backend/CrawSoundTranslator.cpp.orig
-+++ src/backend/CrawSoundTranslator.cpp
-@@ -132,6 +132,13 @@
- 		// get user preferences for saving the raw data
- 		static bool parametersGotten=false;
- 		static AFrontendHooks::RawParameters parameters;
-+
-+		// init parameters which cannot be changed by the RAW parameters dialog
-+		parameters.channelCount=sound->getChannelCount();
-+		parameters.sampleRate=sound->getSampleRate();
-+		parameters.dataLength=sound->getLength();
-+		parameters.dataOffset=0;
-+
- 		useLastUserPrefs&=parametersGotten;
- 		if(!useLastUserPrefs)
- 		{
--- src/frontend_fox/CRawDialog.cpp.orig
-+++ src/frontend_fox/CRawDialog.cpp
-@@ -137,8 +137,11 @@
- 
- 	if(execute(PLACEMENT_SCREEN))
- 	{
-		parameters.channelCount=atoi(channelsCountComboBox->getText().text());
-		parameters.sampleRate=atoi(sampleRateComboBox->getText().text());
-+		// don't apply values of hidden GUI controls
-+		if (showLoadRawParameters) {
-+			parameters.channelCount=atoi(channelsCountComboBox->getText().text());
-+			parameters.sampleRate=atoi(sampleRateComboBox->getText().text());
-+		}
- 
- 		switch(sampleFormatComboBox->getCurrentItem())
- 		{
-@@ -158,19 +161,22 @@
- 
- 		parameters.endian= byteOrderToggleButton->getState() ? AFrontendHooks::RawParameters::eBigEndian : AFrontendHooks::RawParameters::eLittleEndian;
- 
-		if(atoi(dataOffsetTextBox->getText().text())<0)
-		{
-			Error(_("invalid negative data offset"));
-			return(false);
-		}
-		parameters.dataOffset=atoi(dataOffsetTextBox->getText().text());
-
-		if(atoi(dataLengthTextBox->getText().text())<0)
-		{
-			Error(_("invalid negative data length"));
-			return(false);
-+		// don't apply values of hidden GUI controls
-+		if (showLoadRawParameters) {
-+			if(atoi(dataOffsetTextBox->getText().text())<0)
-+			{
-+				Error(_("invalid negative data offset"));
-+				return(false);
-+			}
-+			parameters.dataOffset=atoi(dataOffsetTextBox->getText().text());
-+
-+			if(atoi(dataLengthTextBox->getText().text())<0)
-+			{
-+				Error(_("invalid negative data length"));
-+				return(false);
-+			}
-+			parameters.dataLength=atoi(dataLengthTextBox->getText().text());
- 		}
-		parameters.dataLength=atoi(dataLengthTextBox->getText().text());
- 
- 		return(true);
- 	}
--- src/frontend_fox/CRawDialog.h.orig
-+++ src/frontend_fox/CRawDialog.h
-@@ -37,7 +37,7 @@
- 	CRawDialog(FXWindow *mainWindow);
- 	virtual ~CRawDialog();
- 
-	bool show(AFrontendHooks::RawParameters &parameters,bool showOffsetAndLengthParameters);
-+	bool show(AFrontendHooks::RawParameters &parameters,bool showLoadRawParameters);
- 
- 	//long onRadioButton(FXObject *sender,FXSelector sel,void *ptr);
- 
--- a/audio/rezound/files/patch-missing-includes
+++ b/audio/rezound/files/patch-missing-includes
@ -1,42 +0,0 @@
--- src/backend/CPortAudioSoundPlayer.cpp.orig
-+++ src/backend/CPortAudioSoundPlayer.cpp
-@@ -23,6 +23,7 @@
- #ifdef ENABLE_PORTAUDIO
- 
- #include <stdio.h>
-+#include <string.h>
- 
- #include <stdexcept>
- 
--- src/backend/CPortAudioSoundRecorder.cpp.orig
-+++ src/backend/CPortAudioSoundRecorder.cpp
-@@ -22,6 +22,8 @@
- 
- #ifdef ENABLE_PORTAUDIO
- 
-+#include <cstdio>
-+
- #include <stdexcept>
- 
- #include "settings.h"
--- src/backend/Generate/CGenerateNoiseAction.cpp.orig
-+++ src/backend/Generate/CGenerateNoiseAction.cpp
-@@ -23,6 +23,8 @@
- 
- #include "../CActionParameters.h"
- 
-+#include <cstdlib>
-+
- CGenerateNoiseAction::CGenerateNoiseAction(const AActionFactory *factory,const CActionSound *actionSound,const double _noiseLength,const double _volume,const NoiseTypes _noiseType,const StereoImage _stereoImage,const double _maxParticleVelocity):
- 	AAction(factory,actionSound),
- 	noiseLength(_noiseLength),	// seconds
--- src/backend/Remaster/CAdaptiveNormalizeAction.cpp.orig
-+++ src/backend/Remaster/CAdaptiveNormalizeAction.cpp
-@@ -20,6 +20,7 @@
- 
- #include "CAdaptiveNormalizeAction.h"
- 
-+#include <cstdio>
- #include <utility>
- 
- #include "../CActionParameters.h"
--- a/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h
+++ b/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h
@ -1,20 +0,0 @@
--- src/PoolFile/TStaticPoolAccesser.h.orig
-+++ src/PoolFile/TStaticPoolAccesser.h
-@@ -43,7 +43,7 @@ public:
- 
- 
- 	// stream-like access methods
-	void read(pool_element_t buffer[],const l_addr_t count) const;
-+	void read(pool_element_t buffer[],l_addr_t count) const;
- 	void write(const pool_element_t buffer[],const l_addr_t count);
- 
- 	void seek(const l_addr_t where);
-@@ -112,7 +112,7 @@ public:
- 	mutable l_addr_t position;
- 
- 
-	void overflowWrite(const pool_element_t buffer[],const l_addr_t count,const bool append);
-+	void overflowWrite(const pool_element_t buffer[],l_addr_t count,const bool append);
- 
- 	void cacheBlock(const l_addr_t where) const;
- 
--- a/audio/rezound/files/patch-src_backend_AStatusComm.cpp
+++ b/audio/rezound/files/patch-src_backend_AStatusComm.cpp
@ -1,19 +0,0 @@
--- src/backend/AStatusComm.cpp.orig	Sun May  1 09:53:40 2005
-+++ src/backend/AStatusComm.cpp	Mon May 16 21:35:32 2005
-@@ -94,12 +94,12 @@
- 
- // --- CStatusBar --------------------------------------
- 
-#include <sys/timeb.h>
-+#include <sys/time.h>
- static unsigned long getCurrentMilliseconds()
- {
-	struct timeb tb;
-	ftime(&tb);
-	return (unsigned long)tb.time*1000UL+(unsigned long)tb.millitm;
-+	struct timeval tp;
-+	(void)gettimeofday(&tp, NULL);
-+	return (unsigned long)tp.tv_sec*1000UL+(unsigned long)tp.tv_usec/1000UL;
- }
- 
- CStatusBar::CStatusBar(const string title,const sample_pos_t firstValue,const sample_pos_t lastValue,const bool showCancelButton) :
--- a/audio/rezound/files/patch-src_backend_CFLACSoundTranslator.cpp
+++ b/audio/rezound/files/patch-src_backend_CFLACSoundTranslator.cpp
@ -1,69 +0,0 @@
--- src/backend/CFLACSoundTranslator.cpp.orig	2005-05-01 06:39:38.000000000 +0200
-+++ src/backend/CFLACSoundTranslator.cpp	2008-03-28 18:08:28.000000000 +0100
-@@ -75,15 +75,15 @@ public:
- 		for(unsigned t=0;t<MAX_CHANNELS;t++)
- 			accessers[t]=NULL;
- 
-		set_filename(filename.c_str());
-+		//set_filename(filename.c_str());
- 
- 		set_metadata_ignore_all();
- 		//set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT);
- 		//set_metadata_respond(FLAC__METADATA_TYPE_CUESHEET);
- 
-		State s=init();
-		if(s!=FLAC__FILE_DECODER_OK)
-			throw runtime_error(string(__func__)+" -- "+s.as_cstring());
-+		FLAC__StreamDecoderInitStatus s=init(filename.c_str());
-+		if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+			throw runtime_error(string(__func__)+" -- "+FLAC__StreamDecoderInitStatusString[s]);
- 	}
- 
- 	virtual ~MyFLACDecoderFile()
-@@ -170,7 +170,7 @@ protected:
- 
- 		// update status bar and detect user cancel
- 		FLAC__uint64 filePosition;
-		FLAC__file_decoder_get_decode_position(decoder_, &filePosition);
-+		FLAC__stream_decoder_get_decode_position(decoder_, &filePosition);
- 		return statusBar.update(filePosition) ? FLAC__STREAM_DECODER_WRITE_STATUS_ABORT : FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- 	}
- 
-@@ -215,7 +215,7 @@ private:
- bool CFLACSoundTranslator::onLoadSound(const string filename,CSound *sound) const
- {
- 	MyFLACDecoderFile f(filename,sound);
-	return f.process_until_end_of_file();
-+	return f.process_until_end_of_stream();
- }
- 
- 
-@@ -258,7 +258,7 @@ bool CFLACSoundTranslator::onSaveSound(c
- 
- 	MyFLACEncoderFile f(saveLength);
- 
-	f.set_filename(filename.c_str());
-+	//f.set_filename(filename.c_str());
- 
- 	f.set_channels(sound->getChannelCount());
- 
-@@ -274,8 +274,8 @@ bool CFLACSoundTranslator::onSaveSound(c
- 	//f.set_metadata(...) // ??? to do to set cues and user notes, etc
- 
- 
-	MyFLACEncoderFile::State s=f.init();
-	if(s==FLAC__STREAM_ENCODER_OK)
-+	FLAC__StreamEncoderInitStatus s=f.init(filename.c_str());
-+	if(s==FLAC__STREAM_ENCODER_INIT_STATUS_OK)
- 	{
- 		#define BUFFER_SIZE 65536
- 		TAutoBuffer<FLAC__int32> buffers[MAX_CHANNELS];
-@@ -328,7 +328,7 @@ bool CFLACSoundTranslator::onSaveSound(c
- 		return true;
- 	}
- 	else
-		throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+s.as_cstring());
-+		throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+FLAC__StreamEncoderInitStatusString[s]);
- 
- }
- 
--- a/audio/rezound/files/patch-src_backend_CSound_defs.h
+++ b/audio/rezound/files/patch-src_backend_CSound_defs.h
@ -1,13 +0,0 @@
--- src/backend/CSound_defs.h.orig	2004-06-18 10:45:47.000000000 +0800
-+++ src/backend/CSound_defs.h	2012-07-06 14:10:05.000000000 +0800
-@@ -50,6 +50,10 @@
- 	#define MAX_LENGTH (0x7fffffffffffffffLL-(1024LL*1024LL))
- 
- 	#include <math.h>
-+	extern "C" {
-+		long double logl(long double);
-+		long double expl(long double);
-+	}
- 	#define sample_fpos_floor(a)	(floorl(a))
- 	#define sample_fpos_ceil(a)	(ceill(a))
- 	#define sample_fpos_round(a)	(nearbyintl(a))
--- a/audio/rezound/pkg-descr
+++ b/audio/rezound/pkg-descr
@ -1,4 +0,0 @@
-ReZound aims to be a stable, open source, and graphical audio file editor
-primarily for but not limited to the Linux operating system.
-
-WWW: http://rezound.sourceforge.net/
--- a/audio/rezound/pkg-plist
+++ b/audio/rezound/pkg-plist
@ -1,15 +0,0 @@
-bin/rezound
-%%DATADIR%%/icon_logo_32.gif
-%%DATADIR%%/impulse_hall1.wav
-%%DATADIR%%/key_bindings.dat
-%%DATADIR%%/menu.dat
-%%DATADIR%%/presets.dat
-%%NLS%%share/locale/de/LC_MESSAGES/rezound.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/rezound.mo
-%%NLS%%share/locale/es/LC_MESSAGES/rezound.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/rezound.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/rezound.mo
-%%PORTDOCS%%%%DOCSDIR%%/Features.txt
-%%PORTDOCS%%%%DOCSDIR%%/FrontendFoxFeatures.txt
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
--- a/devel/Makefile
+++ b/devel/Makefile
@ -4426,7 +4426,6 @@
    SUBDIR += py-uncompyle2
    SUBDIR += py-unipath
    SUBDIR += py-unittest2
-    SUBDIR += py-unittestplus
    SUBDIR += py-unpaddedbase64
    SUBDIR += py-urlimport
    SUBDIR += py-urwid
--- a/devel/py-unittestplus/Makefile
+++ b/devel/py-unittestplus/Makefile
@ -1,21 +0,0 @@
-# Created by: Kouki Hashimoto <hsmtkk@gmail.com>
-# $FreeBSD$
-
-PORTNAME=	unittestplus
-PORTVERSION=	1.1.1
-PORTREVISION=	1
-CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	hsmtkk@gmail.com
-COMMENT=	Test utilities built on unittest
-
-BROKEN=		unfetchable
-DEPRECATED=	Tarballs and upstream website disappeared
-EXPIRATION_DATE=2016-02-29
-
-USES=		python zip
-USE_PYTHON=	distutils autoplist
-
-.include <bsd.port.mk>
--- a/devel/py-unittestplus/distinfo
+++ b/devel/py-unittestplus/distinfo
@ -1,2 +0,0 @@
-SHA256 (unittestplus-1.1.1.zip) = d28c84c38e561319868d9b367f2d6266be0bdecb1700e4640c1bce5a7aa11a39
-SIZE (unittestplus-1.1.1.zip) = 13517
--- a/devel/py-unittestplus/pkg-descr
+++ b/devel/py-unittestplus/pkg-descr
@ -1,8 +0,0 @@
-unittestplus is test utilities built on unittest.
-
-It includes an augmented TestCase class with improved (stricter and more
-informative) assert methods; test auto discovery; utility functions
-for running test and combining TestCase classes into suites and prettier
-verbose test output. 
-
-WWW: http://code.google.com/p/unittestplus/
--- a/net/Makefile
+++ b/net/Makefile
@ -455,7 +455,6 @@
    SUBDIR += ntimed
    SUBDIR += ntlmaps
    SUBDIR += ntop
-    SUBDIR += ntopng
    SUBDIR += ntp
    SUBDIR += ntp-devel
    SUBDIR += ntraceroute
@ -1077,7 +1076,6 @@
    SUBDIR += rubygem-amq-protocol
    SUBDIR += rubygem-amqp
    SUBDIR += rubygem-amqp-utils
-    SUBDIR += rubygem-amqp067
    SUBDIR += rubygem-aws-s3
    SUBDIR += rubygem-aws-ses
    SUBDIR += rubygem-bunny
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@ -1,56 +0,0 @@
-# Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
-# $FreeBSD$
-
-PORTNAME=	ntopng
-PORTVERSION=	1.2.1
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	SF/ntop/${PORTNAME}
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Network monitoring tool with command line and web interfaces
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BROKEN=		Fails to build
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-02-29
-
-LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool \
-		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
-		libndpi.so:${PORTSDIR}/net/ndpi \
-		libzmq.so:${PORTSDIR}/net/libzmq4
-
-GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
-USE_LDCONFIG=	yes
-USES=	 	autoreconf cpe gmake libtool pathfix pkgconfig sqlite tar:tgz
-SUB_FILES=	ntopng-geoipupdate.sh
-
-CPE_VENDOR=	ntop
-
-OPTIONS_DEFINE=	GEOIP NLS
-OPTIONS_DEFAULT=	GEOIP
-GEOIP_BUILD_DEPENDS=	geoiplookup:${PORTSDIR}/net/GeoIP
-NLS_USES=	gettext
-
-USE_RC_SUBR=	ntopng
-
-post-extract:
-	@${FIND} ${WRKSRC} -name "*~" -delete
-	@${RMDIR} ${WRKSRC}/httpdocs/ssl
-	@${RMDIR} ${WRKSRC}/httpdocs/geoip
-
-do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
-	${MKDIR} ${STAGEDIR}${DATADIR}/httpdocs
-	${MKDIR} ${STAGEDIR}${DATADIR}/scripts
-	cd ${WRKSRC}/httpdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/httpdocs
-	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoipupdate.sh ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
--- a/net/ntopng/distinfo
+++ b/net/ntopng/distinfo
@ -1,2 +0,0 @@
-SHA256 (ntopng-1.2.1.tgz) = 9b98114358d350caad2dcdbacceb895288f958dbbbfddf21a23b921d1a1b68b5
-SIZE (ntopng-1.2.1.tgz) = 9381092
--- a/net/ntopng/files/ntopng-geoipupdate.sh.in
+++ b/net/ntopng/files/ntopng-geoipupdate.sh.in
@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -eu
-mkdir -p %%DATADIR%%/httpdocs/geoip
-
-# arguments:
-# $1 URL
-# $2 output file name
-_fetch() {
-    url="$1"
-    out="$2"
-    TEMPFILE="$(mktemp "%%DATADIR%%"/httpdocs/geoip/GeoIP.dat-XXXXXX)"
-    trap 'rc=$? ; set +e ; rm -f "'"$TEMPFILE"'" ; exit $rc' 0
-    if fetch -o - "$url" | gunzip >> "$TEMPFILE" ; then
-	chmod 444 "$TEMPFILE"
-	if ! mv -f "$TEMPFILE" "%%DATADIR%%"/"$2" ; then
-	    echo "Unable to replace %%DATADIR%%/$2"
-	    return 2
-	fi
-    else
-	echo "$2 download failed"
-	return 1
-    fi
-    rm -f "$TEMPFILE"
-    trap - 0
-    return 0
-}
-
-echo Fetching GeoLiteCity.dat...
-_fetch "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz" GeoLiteCity.dat
-
-echo Fetching GeoLiteCityv6.dat...
-_fetch "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" GeoLiteCityv6.dat
-
-echo Fetching GeoIPASNum.dat...
-_fetch "http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz" GeoIPASNum.dat.gz
-
-echo Fetching GeoIPASNumv6.dat...
-_fetch "http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz" GeoIPASNumv6.dat.gz
--- a/net/ntopng/files/ntopng.in
+++ b/net/ntopng/files/ntopng.in
@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: ntopng
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable ntop:
-#
-# ntopng_enable (bool):		Set it to "YES" to enable ntop
-#				Default is "NO".
-# ntopng_flags (flags):		Set extra flags to ntop
-#				Default is "-d --use-syslog=daemon". see ntop(8).
-#
-
-. /etc/rc.subr
-
-name=ntopng
-rcvar=ntopng_enable
-pid_path=/var/run/${name}.pid
-httpdocs_path=%%DATADIR%%/httpdocs
-scripts_path=%%DATADIR%%/scripts
-callbacks_path=%%DATADIR%%/scripts/callbacks
-user_path=%%PREFIX%%/etc/ntopng-users.conf
-
-load_rc_config $name
-
-: ${ntopng_enable="NO"}
-: ${ntopng_flags="-e -G ${pid_path}"}
-
-command=%%PREFIX%%/bin/ntopng
-command_args="-e -G $pid_path -1 $httpdocs_path -2 $scripts_path -3 $callbacks_path"
-
-run_rc_command "$1"
--- a/net/ntopng/files/patch-Makefile.in
+++ b/net/ntopng/files/patch-Makefile.in
@ -1,171 +0,0 @@
--- Makefile.in.orig	2015-05-13 13:29:47.790658000 -0500
-+++ Makefile.in	2015-05-13 13:30:08.207655000 -0500
-@@ -6,68 +6,28 @@
- INSTALL_DIR=@INSTALL_DIR@
- MAN_DIR=@MAN_DIR@
- ######
-HAS_NDPI=$(shell pkg-config --exists libndpi; echo $$?)
-ifeq ($(HAS_NDPI), 0)
-    NDPI_INC = $(shell pkg-config --cflags libndpi | sed -e 's/\(-I[^ \t]*\)/\1\/libndpi/g')
-    NDPI_LIB = $(shell pkg-config --libs libndpi)
-    NDPI_LIB_DEP =
-else
-    NDPI_INC=-I./nDPI/src/include
-    NDPI_LIB=./nDPI/src/lib/.libs/libndpi.a
-    NDPI_LIB_DEP=$(NDPI_LIB)
-endif
-+NDPI_INC = $(shell pkg-config --cflags libndpi | sed -e 's/\(-I[^ \t]*\)/\1\/libndpi/g')
-+NDPI_LIB = $(shell pkg-config --libs libndpi)
-+NDPI_LIB_DEP =
- ######
- LIBPCAP=-lpcap
- ######
- MONGOOSE_HOME=./third-party/mongoose
- MONGOOSE_INC=-I$(MONGOOSE_HOME)
- ######
-HAS_LUAJIT=$(shell pkg-config --exists luajit; echo $$?)
-ifeq ($(HAS_LUAJIT), 0)
-	LUAJIT_INC = $(shell pkg-config --cflags luajit)
-	LUAJIT_LIB = $(shell pkg-config --libs luajit)
-else
-	LUAJIT_HOME=./third-party/LuaJIT-2.0.3
-	LUAJIT_INC=-I$(LUAJIT_HOME)/src
-	LUAJIT_LIB=$(LUAJIT_HOME)/src/libluajit.a
-endif
-+LUAJIT_INC = $(shell pkg-config --cflags luajit)
-+LUAJIT_LIB = $(shell pkg-config --libs luajit)
- ######
-LIBRRDTOOL_HOME=third-party/rrdtool-1.4.8
-HAS_LIBRRDTOOL=$(shell pkg-config --exists librrd; echo $$?)
-ifeq ($(HAS_LIBRRDTOOL), 0)
-	LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
-	LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd)
-else
-	LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
-	LIBRRDTOOL_LIB=$(LIBRRDTOOL_HOME)/src/.libs/librrd_th.a
-endif
-+LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
-+LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd)
- ######
- HTTPCLIENT_INC=third-party/http-client-c/src/
- ######
-HAS_JSON=$(shell pkg-config --exists json-c; echo $$?)
-ifeq ($(HAS_JSON), 0)
-	JSON_INC = $(shell pkg-config --cflags json-c)
-	JSON_LIB = $(shell pkg-config --libs json-c)
-else
-	JSON_HOME=third-party/json-c
-	JSON_INC=-I$(JSON_HOME)
-	JSON_LIB=$(JSON_HOME)/.libs/libjson-c.a
-endif
-+JSON_INC = $(shell pkg-config --cflags json-c)
-+JSON_LIB = $(shell pkg-config --libs json-c)
- ######
-HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?)
-ifeq ($(HAS_ZEROMQ), 0)
-	ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
-	ZMQ_STATIC=/usr/local/lib/libzmq.a
-	ifeq ($(wildcard $(ZMQ_STATIC)),)
-		ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
-	else
-		ZEROMQ_LIB = $(ZMQ_STATIC)
-	endif
-else
-	ZEROMQ_HOME=./third-party/zeromq-3.2.4
-	ZEROMQ_INC=-I$(ZEROMQ_HOME)/include
-	ZEROMQ_LIB=$(ZEROMQ_HOME)/src/.libs/libzmq.a
-endif
-+ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
-+ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
- ######
- EWH_HOME=third-party/EWAHBoolArray
- EWH_INC=$(EWH_HOME)/headers
-@@ -91,22 +51,6 @@
- 
- LIB_TARGETS =
- 
-ifneq ($(HAS_LUAJIT), 0)
-LIB_TARGETS += $(LUAJIT_LIB)
- endif
-
-ifneq ($(HAS_ZEROMQ), 0)
-LIB_TARGETS += $(ZEROMQ_LIB)
-endif
-
-ifneq ($(HAS_LIBRRDTOOL), 0)
-LIB_TARGETS += $(LIBRRDTOOL_LIB)
-endif
-
-ifneq ($(HAS_JSON), 0)
-LIB_TARGETS += $(JSON_LIB)
-endif
-
- .PHONY: default all clean docs test
- 
- .NOTPARALLEL: default all
-@@ -129,24 +73,6 @@
- $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
- 	$(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
- 
-$(NDPI_LIB): nDPI
-	cd nDPI; if test ! -f Makefile; then ./autogen.sh ; ./configure; fi; make
-
-nDPI:
-	svn co https://svn.ntop.org/svn/ntop/trunk/nDPI/
-
-$(LUAJIT_LIB):
-	cd $(LUAJIT_HOME); @GMAKE@
-
-$(ZEROMQ_LIB):
-	cd $(ZEROMQ_HOME); ./configure --without-documentation; @GMAKE@
-
-$(LIBRRDTOOL_LIB):
-	cd $(LIBRRDTOOL_HOME); ./configure --disable-rrd_graph --disable-libdbi --disable-libwrap --disable-rrdcgi --disable-libtool-lock --disable-nls --disable-rpath --disable-perl --disable-ruby --disable-lua --disable-tcl --disable-python --disable-dependency-tracking; cd src; @GMAKE@ librrd_th.la
-
-$(JSON_LIB):
-	cd $(JSON_HOME); ./autogen.sh; ./configure; @GMAKE@
-
- clean:
- 	-rm -f *.o *~ svn-commit.* #config.h
- 	-rm -f $(TARGET)
-@@ -156,10 +82,6 @@
- 	cat privkey.pem cert.pem > httpdocs/ssl/ntopng-cert.pem
- 	/bin/rm -f privkey.pem cert.pem
- 
-veryclean:
-	-rm -rf nDPI
-
-
- geoip: httpdocs/geoip/GeoLiteCity.dat httpdocs/geoip/GeoLiteCityv6.dat httpdocs/geoip/GeoIPASNum.dat httpdocs/geoip/GeoIPASNumv6.dat
- 
- httpdocs/geoip/GeoLiteCity.dat:
-@@ -189,7 +111,6 @@
- 	cp -r doc *.cpp *.h configure COPYING README.* *.in ntopng.8 httpdocs scripts packages third-party ntopng-@NTOPNG_VERSION@
- 	find ntopng-@NTOPNG_VERSION@ -name ".svn" | xargs /bin/rm -rf
- 	-rm ntopng-@NTOPNG_VERSION@/httpdocs/geoip/*
-	cd ntopng-@NTOPNG_VERSION@; svn co https://svn.ntop.org/svn/ntop/trunk/nDPI/; cd ..
- 	tar cvfz ntopng-@NTOPNG_VERSION@.tgz ntopng-@NTOPNG_VERSION@
- 	#
- 	rm -f $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(RPM_PKG)
-@@ -232,21 +153,8 @@
- dist:
- 	rm -rf ntopng-@NTOPNG_VERSION@
- 	mkdir ntopng-@NTOPNG_VERSION@
-	cd ntopng-@NTOPNG_VERSION@; svn co https://svn.ntop.org/svn/ntop/trunk/ntopng/; cd ntopng; svn co https://svn.ntop.org/svn/ntop/trunk/nDPI/; cd ..; find ntopng -name .svn | xargs rm -rf ; mv ntopng ntopng-@NTOPNG_VERSION@; tar cvfz ../ntopng-@NTOPNG_VERSION@.tgz ntopng-@NTOPNG_VERSION@
- 
- install: ntopng
-	@echo "Make sure you have already run 'make geoip' to also install geoip dat files"
-	@echo "While we provide you an install make target, we encourage you"
-	@echo "to create a package and install that"
-	@echo "rpm - do 'make build-rpm'"
-	@echo "deb - do 'cd packages/ubuntu;./configure;make"
-	mkdir -p $(INSTALL_DIR)/share/ntopng $(MAN_DIR)/man/man8 $(INSTALL_DIR)/bin
-	cp ntopng $(INSTALL_DIR)/bin
-	cp ./ntopng.8 $(MAN_DIR)/man/man8
-	cp -r ./httpdocs $(INSTALL_DIR)/share/ntopng
-	cp -r ./scripts $(INSTALL_DIR)/share/ntopng
-	find $(INSTALL_DIR)/share/ntopng -name "*~"   | xargs /bin/rm -f
-	find $(INSTALL_DIR)/share/ntopng -name ".svn" | xargs /bin/rm -rf
- 
- uninstall:
- 	if test -f $(INSTALL_DIR)/bin/ntopng; then rm $(INSTALL_DIR)/bin/ntopng; fi;
--- a/net/ntopng/files/patch-configure.ac
+++ b/net/ntopng/files/patch-configure.ac
@ -1,40 +0,0 @@
--- configure.ac.orig	2014-08-15 02:03:01.405288503 +0600
-+++ configure.ac	2014-08-15 02:05:37.514273838 +0600
-@@ -18,8 +18,8 @@
- SVN_RELEASE=`svn info . | grep "^Revision"|cut -d " " -f 2`
- SVN_DATE=`svn info . | grep "^Last Changed Date"|cut -d " " -f 4-`
- else
-SVN_RELEASE="${PACKAGE_VERSION}"
-SVN_DATE=`date`
-+SVN_RELEASE="8205"
-+SVN_DATE="2014-09-06 19:23:32 +0600 (Sat, 06 Sep 2014)"
- fi
- 
- AC_DEFINE_UNQUOTED(NTOPNG_SVN_RELEASE, "r${SVN_RELEASE}", [SVN Release])
-@@ -178,18 +178,6 @@
- 	GPP="g++"
- fi
- 
-SVN=`which svn`
-if test x$SVN = x
-then
-	AC_MSG_RESULT(FATAL ERROR: svn is not installed on your host)
-fi
-
-WGET=`which wget`
-if test x$WGET = x
-then
-	AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data)
-fi
-
- umask 002
- 
- INSTALL_DIR=${prefix}
-@@ -222,7 +210,6 @@
- AC_SUBST(SQLITE_LIB)
- AC_SUBST(GMAKE)
- AC_SUBST(GPP)
-AC_SUBST(SVN)
- AC_SUBST(CFLAGS)
- AC_SUBST(CXXFLAGS)
- AC_SUBST(CPPFLAGS)
--- a/net/ntopng/files/patch-ntop__includes.h
+++ b/net/ntopng/files/patch-ntop__includes.h
@ -1,22 +0,0 @@
--- ntop_includes.h.orig	2014-09-07 02:11:07.296297465 +0600
-+++ ntop_includes.h	2014-09-07 02:14:50.419281644 +0600
-@@ -81,6 +81,8 @@
- #include <math.h>
- #include <sys/stat.h>
- #include <zmq.h>
-+#include <sys/param.h>
-+#include <machine/endian.h>
- 
- #ifdef __APPLE__
- #include <uuid/uuid.h>
-@@ -88,8 +90,8 @@
- 
- extern "C" {
- #include "pcap.h"
-#include "ndpi_main.h"
-#include "luajit.h"
-+#include <ndpi_main.h>
-+#include <luajit.h>
- #include "lauxlib.h"
- #include "lualib.h"
- #ifdef HAVE_PF_RING
--- a/net/ntopng/pkg-descr
+++ b/net/ntopng/pkg-descr
@ -1,5 +0,0 @@
-ntopng is a new generation flexible and feature-rich tool for monitoring and 
-troubleshooting local area networks. It provides command line and web
-interfaces, the latter via an embedded web server. ntop is based on libpcap.
-
-WWW: http://www.ntop.org/products/ntop/
--- a/net/ntopng/pkg-message
+++ b/net/ntopng/pkg-message
@ -1,14 +0,0 @@
----------------------------------------------------------------------------
-WARNING:
-
-In the past, ntop has been the subject of repeated security vulner-
-abilities, particularly relating to its web interface.  It is strongly
-suggested that you protect your ntop web interface via packet filters
-or TCP wrappers.
-
-Please install redis server from databases/redis or use -r to specify
-a remote one.
-
-Please use ntopng-geoipupdate.sh to update GeoIP database to the
-latest.
----------------------------------------------------------------------------
--- a/net/ntopng/pkg-plist
+++ b/net/ntopng/pkg-plist
@ -1,291 +0,0 @@
-bin/ntopng
-bin/ntopng-geoipupdate.sh
-man/man8/ntopng.8.gz
-%%DATADIR%%/httpdocs/favicon.ico
-%%DATADIR%%/httpdocs/login.html
-%%DATADIR%%/httpdocs/test.lp
-%%DATADIR%%/httpdocs/bootstrap/css/bootstrap-theme.css
-%%DATADIR%%/httpdocs/bootstrap/css/bootstrap-theme.css.map
-%%DATADIR%%/httpdocs/bootstrap/css/bootstrap.css
-%%DATADIR%%/httpdocs/bootstrap/css/bootstrap.css.map
-%%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.eot
-%%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.svg
-%%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.ttf
-%%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.woff
-%%DATADIR%%/httpdocs/bootstrap/img/glyphicons-halflings-white.png
-%%DATADIR%%/httpdocs/bootstrap/img/glyphicons-halflings.png
-%%DATADIR%%/httpdocs/bootstrap/js/bootstrap.js
-%%DATADIR%%/httpdocs/css/bootstrap-datetimepicker.css
-%%DATADIR%%/httpdocs/css/bubble-chart.css
-%%DATADIR%%/httpdocs/css/cal-heatmap.css
-%%DATADIR%%/httpdocs/css/cubism.css
-%%DATADIR%%/httpdocs/css/datepicker.css
-%%DATADIR%%/httpdocs/css/dc.css
-%%DATADIR%%/httpdocs/css/flags.css
-%%DATADIR%%/httpdocs/css/jquery-ui.css
-%%DATADIR%%/httpdocs/css/ntopng.css
-%%DATADIR%%/httpdocs/css/pagingbar.css
-%%DATADIR%%/httpdocs/css/pie-chart.css
-%%DATADIR%%/httpdocs/css/prettify.css
-%%DATADIR%%/httpdocs/css/rickshaw.css
-%%DATADIR%%/httpdocs/css/sequence_sunburst.css
-%%DATADIR%%/httpdocs/css/tablesorted.css
-%%DATADIR%%/httpdocs/css/timeline.css
-%%DATADIR%%/httpdocs/css/timepicker.css
-%%DATADIR%%/httpdocs/css/Rickshaw/detail.css
-%%DATADIR%%/httpdocs/css/Rickshaw/graph.css
-%%DATADIR%%/httpdocs/css/Rickshaw/legend.css
-%%DATADIR%%/httpdocs/font-awesome/css/font-awesome.css
-%%DATADIR%%/httpdocs/font-awesome/css/font-awesome.min.css
-%%DATADIR%%/httpdocs/font-awesome/fonts/FontAwesome.otf
-%%DATADIR%%/httpdocs/font-awesome/fonts/fontawesome-webfont.eot
-%%DATADIR%%/httpdocs/font-awesome/fonts/fontawesome-webfont.svg
-%%DATADIR%%/httpdocs/font-awesome/fonts/fontawesome-webfont.ttf
-%%DATADIR%%/httpdocs/font-awesome/fonts/fontawesome-webfont.woff
-%%DATADIR%%/httpdocs/font-awesome/less/bordered-pulled.less
-%%DATADIR%%/httpdocs/font-awesome/less/core.less
-%%DATADIR%%/httpdocs/font-awesome/less/fixed-width.less
-%%DATADIR%%/httpdocs/font-awesome/less/font-awesome.less
-%%DATADIR%%/httpdocs/font-awesome/less/icons.less
-%%DATADIR%%/httpdocs/font-awesome/less/larger.less
-%%DATADIR%%/httpdocs/font-awesome/less/list.less
-%%DATADIR%%/httpdocs/font-awesome/less/mixins.less
-%%DATADIR%%/httpdocs/font-awesome/less/path.less
-%%DATADIR%%/httpdocs/font-awesome/less/rotated-flipped.less
-%%DATADIR%%/httpdocs/font-awesome/less/spinning.less
-%%DATADIR%%/httpdocs/font-awesome/less/stacked.less
-%%DATADIR%%/httpdocs/font-awesome/less/variables.less
-%%DATADIR%%/httpdocs/font-awesome/scss/_bordered-pulled.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_core.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_fixed-width.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_icons.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_larger.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_list.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_mixins.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_path.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_rotated-flipped.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_spinning.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_stacked.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/_variables.scss
-%%DATADIR%%/httpdocs/font-awesome/scss/font-awesome.scss
-%%DATADIR%%/httpdocs/img/asc.gif
-%%DATADIR%%/httpdocs/img/blank.gif
-%%DATADIR%%/httpdocs/img/block-end.png
-%%DATADIR%%/httpdocs/img/block-start.png
-%%DATADIR%%/httpdocs/img/cpu_icon.png
-%%DATADIR%%/httpdocs/img/desc.gif
-%%DATADIR%%/httpdocs/img/flags.png
-%%DATADIR%%/httpdocs/img/glyphicons-halflings-white.png
-%%DATADIR%%/httpdocs/img/glyphicons-halflings.png
-%%DATADIR%%/httpdocs/img/graph.gif
-%%DATADIR%%/httpdocs/img/info.png
-%%DATADIR%%/httpdocs/img/info_icon.png
-%%DATADIR%%/httpdocs/img/interaction-graph-icons/apache2.png
-%%DATADIR%%/httpdocs/img/interaction-graph-icons/firefox.png
-%%DATADIR%%/httpdocs/img/interaction-graph-icons/java.png
-%%DATADIR%%/httpdocs/img/interaction-graph-icons/nprobe.png
-%%DATADIR%%/httpdocs/img/interaction-graph-icons/ntopng.png
-%%DATADIR%%/httpdocs/img/interaction-graph-icons/redis-server.png
-%%DATADIR%%/httpdocs/img/interaction-graph-icons/remote_hosts.png
-%%DATADIR%%/httpdocs/img/interaction-graph-icons/sprobe.png
-%%DATADIR%%/httpdocs/img/loading.gif
-%%DATADIR%%/httpdocs/img/logo.png
-%%DATADIR%%/httpdocs/img/maps/conv30.png
-%%DATADIR%%/httpdocs/img/maps/conv40.png
-%%DATADIR%%/httpdocs/img/maps/conv50.png
-%%DATADIR%%/httpdocs/img/maps/heart30.png
-%%DATADIR%%/httpdocs/img/maps/heart40.png
-%%DATADIR%%/httpdocs/img/maps/heart50.png
-%%DATADIR%%/httpdocs/img/maps/m1.png
-%%DATADIR%%/httpdocs/img/maps/m2.png
-%%DATADIR%%/httpdocs/img/maps/m3.png
-%%DATADIR%%/httpdocs/img/maps/m4.png
-%%DATADIR%%/httpdocs/img/maps/m5.png
-%%DATADIR%%/httpdocs/img/maps/people35.png
-%%DATADIR%%/httpdocs/img/maps/people45.png
-%%DATADIR%%/httpdocs/img/maps/people55.png
-%%DATADIR%%/httpdocs/img/network_icon.png
-%%DATADIR%%/httpdocs/img/os_icon.png
-%%DATADIR%%/httpdocs/img/throbber.gif
-%%DATADIR%%/httpdocs/img/warning.png
-%%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_bottom.inc
-%%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_id.inc
-%%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_top.inc
-%%DATADIR%%/httpdocs/inc/flows_stats_bottom.inc
-%%DATADIR%%/httpdocs/inc/flows_stats_id.inc
-%%DATADIR%%/httpdocs/inc/flows_stats_middle.inc
-%%DATADIR%%/httpdocs/inc/flows_stats_top.inc
-%%DATADIR%%/httpdocs/inc/geolocation_disclaimer.inc
-%%DATADIR%%/httpdocs/inc/header.inc
-%%DATADIR%%/httpdocs/inc/hosts_stats_bottom.inc
-%%DATADIR%%/httpdocs/inc/hosts_stats_id.inc
-%%DATADIR%%/httpdocs/inc/hosts_stats_top.inc
-%%DATADIR%%/httpdocs/inc/index_TopASNs.inc
-%%DATADIR%%/httpdocs/inc/index_TopApplications.inc
-%%DATADIR%%/httpdocs/inc/index_TopFlowSenders.inc
-%%DATADIR%%/httpdocs/inc/index_TopHosts.inc
-%%DATADIR%%/httpdocs/inc/index_TopPorts.inc
-%%DATADIR%%/httpdocs/inc/processes_stats_bottom.inc
-%%DATADIR%%/httpdocs/inc/processes_stats_id.inc
-%%DATADIR%%/httpdocs/inc/processes_stats_top.inc
-%%DATADIR%%/httpdocs/inc/sflows_stats_bottom.inc
-%%DATADIR%%/httpdocs/inc/sflows_stats_top.inc
-%%DATADIR%%/httpdocs/inc/sprobe_process.inc
-%%DATADIR%%/httpdocs/inc/sprobe_process_header.inc
-%%DATADIR%%/httpdocs/js/README.gauge
-%%DATADIR%%/httpdocs/js/bootstrap-datatable.js
-%%DATADIR%%/httpdocs/js/bootstrap-datetimepicker.js
-%%DATADIR%%/httpdocs/js/bootstrap.ajaxpager-0.8.js
-%%DATADIR%%/httpdocs/js/bootstrap3-typeahead.js
-%%DATADIR%%/httpdocs/js/bubble-chart.js
-%%DATADIR%%/httpdocs/js/cal-heatmap.js
-%%DATADIR%%/httpdocs/js/cpu_bar.js
-%%DATADIR%%/httpdocs/js/crossfilter.js
-%%DATADIR%%/httpdocs/js/cubism.v1.js
-%%DATADIR%%/httpdocs/js/d3.v3.js
-%%DATADIR%%/httpdocs/js/dc.js
-%%DATADIR%%/httpdocs/js/gauge.js
-%%DATADIR%%/httpdocs/js/googleMapJson.js
-%%DATADIR%%/httpdocs/js/handlebars-1.0.0.0.beta.6.js
-%%DATADIR%%/httpdocs/js/highlight.js
-%%DATADIR%%/httpdocs/js/html5shiv.js
-%%DATADIR%%/httpdocs/js/jquery-ui.js
-%%DATADIR%%/httpdocs/js/jquery.form.js
-%%DATADIR%%/httpdocs/js/jquery.js
-%%DATADIR%%/httpdocs/js/jquery.peity.js
-%%DATADIR%%/httpdocs/js/jquery.sparkline.js
-%%DATADIR%%/httpdocs/js/jquery.tablesorter.js
-%%DATADIR%%/httpdocs/js/line-graph.js
-%%DATADIR%%/httpdocs/js/markerclusterer.js
-%%DATADIR%%/httpdocs/js/matrix_volume.js
-%%DATADIR%%/httpdocs/js/moment.js
-%%DATADIR%%/httpdocs/js/pie-chart.js
-%%DATADIR%%/httpdocs/js/prettify.js
-%%DATADIR%%/httpdocs/js/rickshaw.js
-%%DATADIR%%/httpdocs/js/sankey.js
-%%DATADIR%%/httpdocs/js/sequence_sunburst.js
-%%DATADIR%%/httpdocs/js/springy-ntop.js
-%%DATADIR%%/httpdocs/js/springyui-ntop.js
-%%DATADIR%%/httpdocs/js/timeline.js
-%%DATADIR%%/scripts/callbacks/daily.lua
-%%DATADIR%%/scripts/callbacks/hourly.lua
-%%DATADIR%%/scripts/callbacks/minute.lua
-%%DATADIR%%/scripts/callbacks/second.lua
-%%DATADIR%%/scripts/lua/API.lua
-%%DATADIR%%/scripts/lua/about.lua
-%%DATADIR%%/scripts/lua/admin/prefs.lua
-%%DATADIR%%/scripts/lua/aggregated_host_details.lua
-%%DATADIR%%/scripts/lua/aggregated_host_stats.lua
-%%DATADIR%%/scripts/lua/aggregated_hosts_stats.lua
-%%DATADIR%%/scripts/lua/config_historical_interface.lua
-%%DATADIR%%/scripts/lua/do_export_data.lua
-%%DATADIR%%/scripts/lua/examples/debug.lua
-%%DATADIR%%/scripts/lua/examples/hello_world.lua
-%%DATADIR%%/scripts/lua/examples/interface.lua
-%%DATADIR%%/scripts/lua/examples/ntop.lua
-%%DATADIR%%/scripts/lua/examples/sqlite.lua
-%%DATADIR%%/scripts/lua/export_data.lua
-%%DATADIR%%/scripts/lua/find_host.lua
-%%DATADIR%%/scripts/lua/flow_details.lua
-%%DATADIR%%/scripts/lua/flow_stats.lua
-%%DATADIR%%/scripts/lua/flows_stats.lua
-%%DATADIR%%/scripts/lua/get_aggregated_host_info.lua
-%%DATADIR%%/scripts/lua/get_alerts_data.lua
-%%DATADIR%%/scripts/lua/get_flow_data.lua
-%%DATADIR%%/scripts/lua/get_flows_data.lua
-%%DATADIR%%/scripts/lua/get_geo_hosts.lua
-%%DATADIR%%/scripts/lua/get_host_activitymap.lua
-%%DATADIR%%/scripts/lua/get_host_contacts.lua
-%%DATADIR%%/scripts/lua/get_host_daily_activity.lua
-%%DATADIR%%/scripts/lua/get_host_data.lua
-%%DATADIR%%/scripts/lua/get_host_traffic.lua
-%%DATADIR%%/scripts/lua/get_host_traffic_matrix.lua
-%%DATADIR%%/scripts/lua/get_hosts_data.lua
-%%DATADIR%%/scripts/lua/get_hosts_interaction.lua
-%%DATADIR%%/scripts/lua/get_top_talkers.lua
-%%DATADIR%%/scripts/lua/get_process_info.lua
-%%DATADIR%%/scripts/lua/get_processes_data.lua
-%%DATADIR%%/scripts/lua/get_system_hosts_interaction.lua
-%%DATADIR%%/scripts/lua/get_treemap.lua
-%%DATADIR%%/scripts/lua/get_user_info.lua
-%%DATADIR%%/scripts/lua/host_details.lua
-%%DATADIR%%/scripts/lua/host_dns_breakdown.lua
-%%DATADIR%%/scripts/lua/host_epp_breakdown.lua
-%%DATADIR%%/scripts/lua/host_get_json.lua
-%%DATADIR%%/scripts/lua/host_l4_stats.lua
-%%DATADIR%%/scripts/lua/host_pkt_distro.lua
-%%DATADIR%%/scripts/lua/host_sflow_distro.lua
-%%DATADIR%%/scripts/lua/host_stats.lua
-%%DATADIR%%/scripts/lua/host_top_peers_protocols.lua
-%%DATADIR%%/scripts/lua/hosts_comparison.lua
-%%DATADIR%%/scripts/lua/hosts_comparison_bubble.lua
-%%DATADIR%%/scripts/lua/hosts_comparison_sankey.lua
-%%DATADIR%%/scripts/lua/hosts_flows_matrix.lua
-%%DATADIR%%/scripts/lua/hosts_geomap.lua
-%%DATADIR%%/scripts/lua/hosts_interaction.lua
-%%DATADIR%%/scripts/lua/hosts_matrix.lua
-%%DATADIR%%/scripts/lua/hosts_stats.lua
-%%DATADIR%%/scripts/lua/hosts_treemap.lua
-%%DATADIR%%/scripts/lua/if_pkt_distro.lua
-%%DATADIR%%/scripts/lua/if_stats_ndpi.lua
-%%DATADIR%%/scripts/lua/if_stats.lua
-%%DATADIR%%/scripts/lua/iface_flows_sankey.lua
-%%DATADIR%%/scripts/lua/iface_hosts_list.lua
-%%DATADIR%%/scripts/lua/iface_ndpi_stats.lua
-%%DATADIR%%/scripts/lua/iface_ports_list.lua
-%%DATADIR%%/scripts/lua/inc/add_user_dialog.lua
-%%DATADIR%%/scripts/lua/inc/delete_user_dialog.lua
-%%DATADIR%%/scripts/lua/inc/password_dialog.lua
-%%DATADIR%%/scripts/lua/inc/sprobe.lua
-%%DATADIR%%/scripts/lua/inc/users.lua
-%%DATADIR%%/scripts/lua/index.lua
-%%DATADIR%%/scripts/lua/interface_stats.lua
-%%DATADIR%%/scripts/lua/logout.lua
-%%DATADIR%%/scripts/lua/modules/alert_utils.lua
-%%DATADIR%%/scripts/lua/modules/lua_trace.lua
-%%DATADIR%%/scripts/lua/modules/sqlite_utils.lua
-%%DATADIR%%/scripts/lua/modules/voip_utils.lua
-%%DATADIR%%/scripts/lua/network_load.lua
-%%DATADIR%%/scripts/lua/page_not_found.lua
-%%DATADIR%%/scripts/lua/pid_stats.lua
-%%DATADIR%%/scripts/lua/popKeys.lua
-%%DATADIR%%/scripts/lua/port_details.lua
-%%DATADIR%%/scripts/lua/processes_stats.lua
-%%DATADIR%%/scripts/lua/protocols/dns_aggregations.lua
-%%DATADIR%%/scripts/lua/protocols/epp_aggregations.lua
-%%DATADIR%%/scripts/lua/resolve_address.lua
-%%DATADIR%%/scripts/lua/set_active_interface.lua
-%%DATADIR%%/scripts/lua/set_if_prefs.lua
-%%DATADIR%%/scripts/lua/sflow_tree.lua
-%%DATADIR%%/scripts/lua/sflows_stats.lua
-%%DATADIR%%/scripts/lua/show_alerts.lua
-%%DATADIR%%/scripts/lua/sprobe.lua
-%%DATADIR%%/scripts/lua/sprobe_data.lua
-%%DATADIR%%/scripts/lua/sprobe_flow_data.lua
-%%DATADIR%%/scripts/lua/sprobe_host_process.lua
-%%DATADIR%%/scripts/lua/sprobe_host_process_data.lua
-%%DATADIR%%/scripts/lua/sprobe_hosts.lua
-%%DATADIR%%/scripts/lua/sprobe_hosts_data.lua
-%%DATADIR%%/scripts/lua/sprobe_hosts_interactions.lua
-%%DATADIR%%/scripts/lua/sprobe_hosts_interactions_data.lua
-%%DATADIR%%/scripts/lua/system_hosts_interaction.lua
-%%DATADIR%%/scripts/lua/top_asn.lua
-%%DATADIR%%/scripts/lua/top_hosts.lua
-%%DATADIR%%/scripts/lua/top_talkers.lua
-%%DATADIR%%/scripts/lua/user_stats.lua
-%%DATADIR%%/scripts/lua/admin/add_user.lua
-%%DATADIR%%/scripts/lua/admin/delete_user.lua
-%%DATADIR%%/scripts/lua/admin/get_users.lua
-%%DATADIR%%/scripts/lua/admin/password_reset.lua
-%%DATADIR%%/scripts/lua/admin/users.lua
-%%DATADIR%%/scripts/lua/inc/footer.lua
-%%DATADIR%%/scripts/lua/inc/menu.lua
-%%DATADIR%%/scripts/lua/inc/sankey.lua
-%%DATADIR%%/scripts/lua/inc/search_host_box.lua
-%%DATADIR%%/scripts/lua/modules/dkjson.lua
-%%DATADIR%%/scripts/lua/modules/flow_utils.lua
-%%DATADIR%%/scripts/lua/modules/graph_utils.lua
-%%DATADIR%%/scripts/lua/modules/lua_utils.lua
-%%DATADIR%%/scripts/lua/modules/persistence.lua
-%%DATADIR%%/scripts/lua/modules/template.lua
-%%DATADIR%%/scripts/lua/modules/top_talkers.lua
--- a/net/rubygem-amqp067/Makefile
+++ b/net/rubygem-amqp067/Makefile
@ -1,27 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	amqp
-PORTVERSION=	0.6.7
-CATEGORIES=	net rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	067
-
-MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	Implementation of the AMQP protocol for RabbitMQ clients
-
-LICENSE=	BSD2CLAUSE RUBY
-LICENSE_COMB=	dual
-
-RUN_DEPENDS=	rubygem-eventmachine>=0.12.4:${PORTSDIR}/devel/rubygem-eventmachine
-
-DEPRECATED=	Upstream prefers net/rubygem-bunny
-EXPIRATION_DATE=2016-02-29
-
-PORTSCOUT=	limit:0.6.7
-
-NO_ARCH=	yes
-USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
-
-.include <bsd.port.mk>
--- a/net/rubygem-amqp067/distinfo
+++ b/net/rubygem-amqp067/distinfo
@ -1,2 +0,0 @@
-SHA256 (rubygem/amqp-0.6.7.gem) = 7d7faf3e394d0a9c5c3574fbd87f9877b85dbd1fa419f5e1dfe84266f56cdfe3
-SIZE (rubygem/amqp-0.6.7.gem) = 83456
--- a/net/rubygem-amqp067/pkg-descr
+++ b/net/rubygem-amqp067/pkg-descr
@ -1,7 +0,0 @@
-Simple asynchronous AMQP driver for Ruby/EventMachine.
-This library works with Ruby 1.8, Ruby 1.9, JRuby and Rubinius.
-
-This library was tested primarily with RabbitMQ, although it
-should be compatible with any server implementing the AMQP 0-8 spec.
-
-WWW: http://rubyamqp.info/