Move multimedia/avidemux26-* to multimedia/avidemux-*

svn path=/head/; revision=389477

MOVED

@@ -7637,3 +7637,4 @@ x11-themes/gtk-flat-theme2||2015-06-10|Has expired: Upstream disappeared
 databases/postgresql84-server||2015-06-10|Has expired: "EOL was reached in July 2014"
 ftp/ncftp1||2015-06-12|Unfetchable
 multimedia/avidemux2||2015-06-13|Branch no longer maintained upstream, use multimedia/avidemux26
+multimedia/avidemux26|multimedia/avidemux|2015-06-13|Renamed

UPDATING

@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20150613:
+  AFFECTS: users of multimedia/avidemux26-*
+  AUTHOR: riggs@FreeBSD.org
+
+  avidemux26 has been renamed to avidemux
+  If you are using binary pkg, 'pkg upgrade' will do the right thing.
+  Users of portmaster/portupgrade have to take a manual step:
+  Portmaster users:
+      portmaster -o multimedia/avidemux multimedia/avidemux26
+  Portupgrade users:
+      portupgrade -o multimedia/avidemux multimedia/avidemux26
+
 20150610:
   AFFECTS: users of databases/postgresql84-server
   AUTHOR: girgen@FreeBSD.org

multimedia/Makefile

@@ -15,10 +15,10 @@
     SUBDIR += audacious-plugins
     SUBDIR += audiopreview
     SUBDIR += avbin
-    SUBDIR += avidemux26
-    SUBDIR += avidemux26-cli
-    SUBDIR += avidemux26-plugins
-    SUBDIR += avidemux26-qt4
+    SUBDIR += avidemux
+    SUBDIR += avidemux-cli
+    SUBDIR += avidemux-plugins
+    SUBDIR += avidemux-qt4
     SUBDIR += avinfo
     SUBDIR += baka-mplayer
     SUBDIR += bangarang

multimedia/avidemux-cli/Makefile

@@ -1,16 +1,16 @@
 # $FreeBSD$
 
-PORTNAME=	avidemux26
-PORTVERSION=	${AVIDEMUX2_VERSION}
+PORTNAME=	avidemux
+PORTVERSION=	${AVIDEMUX_VERSION}
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-cli
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (cli)
 
-LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux26
+LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux
 
-MASTERDIR=	${.CURDIR}/../avidemux26
+MASTERDIR=	${.CURDIR}/../avidemux
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile.common"

multimedia/avidemux-plugins/Makefile

@@ -1,17 +1,17 @@
 # Created by: Anish Mistry (with help from mean)
 # $FreeBSD$
 
-PORTNAME=	avidemux26
-PORTVERSION=	${AVIDEMUX2_VERSION}
+PORTNAME=	avidemux
+PORTVERSION=	${AVIDEMUX_VERSION}
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-plugins
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (Plugins)
 
-LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux26
+LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux
 
-MASTERDIR=	${.CURDIR}/../avidemux26
+MASTERDIR=	${.CURDIR}/../avidemux
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile.common"
@@ -23,18 +23,18 @@ CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${P
 CMAKE_ARGS+=	-DPLUGIN_UI=ALL
 
 .if ${PORT_OPTIONS:MCLI}
-BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/cli/config.h:${PORTSDIR}/multimedia/avidemux26-cli
-RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/cli/config.h:${PORTSDIR}/multimedia/avidemux26-cli
+BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/cli/config.h:${PORTSDIR}/multimedia/avidemux-cli
+RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/cli/config.h:${PORTSDIR}/multimedia/avidemux-cli
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/qt4/config.h:${PORTSDIR}/multimedia/avidemux26-qt4
-RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/qt4/config.h:${PORTSDIR}/multimedia/avidemux26-qt4
+BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/qt4/config.h:${PORTSDIR}/multimedia/avidemux-qt4
+RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/qt4/config.h:${PORTSDIR}/multimedia/avidemux-qt4
 .endif
 
 .if ${PORT_OPTIONS:MGTK3}
-BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/gtk/config.h:${PORTSDIR}/multimedia/avidemux26-gtk
-RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/gtk/config.h:${PORTSDIR}/multimedia/avidemux26-gtk
+BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/gtk/config.h:${PORTSDIR}/multimedia/avidemux-gtk
+RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/gtk/config.h:${PORTSDIR}/multimedia/avidemux-gtk
 .endif
 
 post-configure: post-configure-common

multimedia/avidemux-qt4/Makefile

@@ -1,16 +1,16 @@
 # $FreeBSD$
 
-PORTNAME=	avidemux26
-PORTVERSION=	${AVIDEMUX2_VERSION}
+PORTNAME=	avidemux
+PORTVERSION=	${AVIDEMUX_VERSION}
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-qt4
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (QT4 UI)
 
-LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux26
+LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux
 
-MASTERDIR=	${.CURDIR}/../avidemux26
+MASTERDIR=	${.CURDIR}/../avidemux
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile.common"

multimedia/avidemux/Makefile

@@ -4,8 +4,8 @@
 # nls files not getting installed with nls=on. are they getting built?
 # sync port options with current software options
 
-PORTNAME=	avidemux26
-PORTVERSION=	${AVIDEMUX2_VERSION}
+PORTNAME=	avidemux
+PORTVERSION=	${AVIDEMUX_VERSION}
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org

multimedia/avidemux/Makefile.common

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-AVIDEMUX2_VERSION=	2.6.10
+AVIDEMUX_VERSION=	2.6.10
 MASTER_SITES=	\
 		SF/avidemux/avidemux/${PORTVERSION}
 DISTNAME=	avidemux_${PORTVERSION}
@@ -13,8 +13,6 @@ LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad \
 
 LICENSE=	GPLv2
 
-CONFLICTS=	avidemux2-*
-
 USE_GNOME=	libxml2
 USE_QT4=	# empty