2 files changed, 69 insertions, 74 deletions

diff --git a/multimedia/libquvi-scripts09/Makefile b/multimedia/libquvi-scripts09/Makefile
index f29fbe5f3056..f9e3092c8eb4 100644
--- a/multimedia/libquvi-scripts09/Makefile
+++ b/multimedia/libquvi-scripts09/Makefile
@@ -2,31 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	libquvi-scripts
-PORTVERSION=	0.9
+PORTVERSION=	0.9.20131130
 CATEGORIES=	multimedia devel
 MASTER_SITES=	SF/quvi/${PORTVERSION}/${PORTNAME}/ \
 		GOOGLE_CODE
 PKGNAMESUFFIX=	09
-DISTNAME=	${PORTNAME}-${PORTVERSION}.${QUVI_VER}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Embedded lua scripts for libquvi and utility scripts
 
 LICENSE=	AGPLv3
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.${QUVI_VER}
-
 OPTIONS_DEFINE=	NSFW
 OPTIONS_SUB=	yes
 NSFW_DESC=	Enable adult website support
 
-USES=		lua:run pathfix tar:xz
+CONFIGURE_ARGS=	--program-suffix=${PKGNAMESUFFIX}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-suffix=09
-
-QUVI_VER=	20131130
+USES=		lua:run pathfix tar:xz
 
-PLIST_SUB+=	VERSION="0.9.${QUVI_VER}"
+PLIST_SUB=	PKGNAMESUFFIX=${PKGNAMESUFFIX} PORTVERSION=${PORTVERSION} QUVIVERSION=${PORTVERSION:R}
 
 PROJECTHOST=	quvi
 
diff --git a/multimedia/libquvi-scripts09/pkg-plist b/multimedia/libquvi-scripts09/pkg-plist
index 8a1a42d45d47..7df34d55bd03 100644
--- a/multimedia/libquvi-scripts09/pkg-plist
+++ b/multimedia/libquvi-scripts09/pkg-plist
@@ -1,65 +1,65 @@
-libdata/pkgconfig/libquvi-scripts-0.9.pc
-man/man7/libquvi-scripts09.7.gz
-man/man7/quvi-modules-3rdparty09.7.gz
-man/man7/quvi-modules09.7.gz
-%%DATADIR%%/0.9
-%%DATADIR%%/%%VERSION%%/README
-%%DATADIR%%/%%VERSION%%/version
-%%DATADIR%%/%%VERSION%%/common/quvi/const.lua
-%%DATADIR%%/%%VERSION%%/common/quvi/debug.lua
-%%DATADIR%%/%%VERSION%%/common/quvi/entity.lua
-%%DATADIR%%/%%VERSION%%/common/quvi/hash.lua
-%%DATADIR%%/%%VERSION%%/common/quvi/hex.lua
-%%DATADIR%%/%%VERSION%%/common/quvi/html.lua
-%%DATADIR%%/%%VERSION%%/common/quvi/lxph.lua 
-%%DATADIR%%/%%VERSION%%/common/quvi/stream.lua
-%%DATADIR%%/%%VERSION%%/common/quvi/time.lua
-%%DATADIR%%/%%VERSION%%/common/quvi/util.lua
-%%DATADIR%%/%%VERSION%%/common/quvi/youtube.lua
-%%DATADIR%%/%%VERSION%%/common/quvi/http/cookie.lua
-%%DATADIR%%/%%VERSION%%/media/101greatgoals.lua
-%%DATADIR%%/%%VERSION%%/media/1tvru.lua
-%%DATADIR%%/%%VERSION%%/media/ardmediathek.lua
-%%DATADIR%%/%%VERSION%%/media/arte.lua
-%%DATADIR%%/%%VERSION%%/media/audioboo.lua
-%%DATADIR%%/%%VERSION%%/media/bikeradar.lua
-%%DATADIR%%/%%VERSION%%/media/canalplus.lua
-%%DATADIR%%/%%VERSION%%/media/cbsnews.lua
-%%DATADIR%%/%%VERSION%%/media/clipfish.lua
-%%DATADIR%%/%%VERSION%%/media/collegehumor.lua
-%%DATADIR%%/%%VERSION%%/media/dailymotion.lua
-%%DATADIR%%/%%VERSION%%/media/dorkly.lua
-%%DATADIR%%/%%VERSION%%/media/funnyordie.lua
-%%DATADIR%%/%%VERSION%%/media/gaskrank.lua
-%%DATADIR%%/%%VERSION%%/media/guardian.lua
-%%DATADIR%%/%%VERSION%%/media/ina.lua
-%%DATADIR%%/%%VERSION%%/media/lego.lua
-%%DATADIR%%/%%VERSION%%/media/liveleak.lua
-%%DATADIR%%/%%VERSION%%/media/majestyc.lua
-%%DATADIR%%/%%VERSION%%/media/metacafe.lua
-%%DATADIR%%/%%VERSION%%/media/myspass.lua
-%%DATADIR%%/%%VERSION%%/media/publicsenat.lua
-%%DATADIR%%/%%VERSION%%/media/sapo.lua
-%%DATADIR%%/%%VERSION%%/media/senat.lua
-%%DATADIR%%/%%VERSION%%/media/sevenload.lua
-%%DATADIR%%/%%VERSION%%/media/soundcloud.lua
-%%DATADIR%%/%%VERSION%%/media/spiegel.lua
-%%DATADIR%%/%%VERSION%%/media/tagtele.lua
-%%DATADIR%%/%%VERSION%%/media/tapuz.lua
-%%DATADIR%%/%%VERSION%%/media/ted.lua
-%%DATADIR%%/%%VERSION%%/media/theonion.lua
-%%DATADIR%%/%%VERSION%%/media/tvlux.lua
-%%DATADIR%%/%%VERSION%%/media/videa.lua
-%%DATADIR%%/%%VERSION%%/media/videobash.lua
-%%DATADIR%%/%%VERSION%%/media/vimeo.lua
-%%DATADIR%%/%%VERSION%%/media/vzaar.lua
-%%DATADIR%%/%%VERSION%%/media/youtube.lua
-%%DATADIR%%/%%VERSION%%/playlist/soundcloud.lua
-%%DATADIR%%/%%VERSION%%/playlist/youtube.lua
-%%DATADIR%%/%%VERSION%%/scan/vzaar.lua
-%%DATADIR%%/%%VERSION%%/scan/youtube.lua
-%%DATADIR%%/%%VERSION%%/subtitle/youtube.lua
-%%DATADIR%%/%%VERSION%%/subtitle/export/subrip.lua
-%%DATADIR%%/%%VERSION%%/util/convert_entities.lua
-%%DATADIR%%/%%VERSION%%/util/resolve_redirections.lua
-%%DATADIR%%/%%VERSION%%/util/to_file_ext.lua
+libdata/pkgconfig/libquvi-scripts-%%QUVIVERSION%%.pc
+man/man7/libquvi-scripts%%PKGNAMESUFFIX%%.7.gz
+man/man7/quvi-modules-3rdparty%%PKGNAMESUFFIX%%.7.gz
+man/man7/quvi-modules%%PKGNAMESUFFIX%%.7.gz
+%%DATADIR%%/%%QUVIVERSION%%
+%%DATADIR%%/%%PORTVERSION%%/README
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/const.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/debug.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/entity.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/hash.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/hex.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/html.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/http/cookie.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/lxph.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/stream.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/time.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/util.lua
+%%DATADIR%%/%%PORTVERSION%%/common/quvi/youtube.lua
+%%DATADIR%%/%%PORTVERSION%%/media/101greatgoals.lua
+%%DATADIR%%/%%PORTVERSION%%/media/1tvru.lua
+%%DATADIR%%/%%PORTVERSION%%/media/ardmediathek.lua
+%%DATADIR%%/%%PORTVERSION%%/media/arte.lua
+%%DATADIR%%/%%PORTVERSION%%/media/audioboo.lua
+%%DATADIR%%/%%PORTVERSION%%/media/bikeradar.lua
+%%DATADIR%%/%%PORTVERSION%%/media/canalplus.lua
+%%DATADIR%%/%%PORTVERSION%%/media/cbsnews.lua
+%%DATADIR%%/%%PORTVERSION%%/media/clipfish.lua
+%%DATADIR%%/%%PORTVERSION%%/media/collegehumor.lua
+%%DATADIR%%/%%PORTVERSION%%/media/dailymotion.lua
+%%DATADIR%%/%%PORTVERSION%%/media/dorkly.lua
+%%DATADIR%%/%%PORTVERSION%%/media/funnyordie.lua
+%%DATADIR%%/%%PORTVERSION%%/media/gaskrank.lua
+%%DATADIR%%/%%PORTVERSION%%/media/guardian.lua
+%%DATADIR%%/%%PORTVERSION%%/media/ina.lua
+%%DATADIR%%/%%PORTVERSION%%/media/lego.lua
+%%DATADIR%%/%%PORTVERSION%%/media/liveleak.lua
+%%DATADIR%%/%%PORTVERSION%%/media/majestyc.lua
+%%DATADIR%%/%%PORTVERSION%%/media/metacafe.lua
+%%DATADIR%%/%%PORTVERSION%%/media/myspass.lua
+%%DATADIR%%/%%PORTVERSION%%/media/publicsenat.lua
+%%DATADIR%%/%%PORTVERSION%%/media/sapo.lua
+%%DATADIR%%/%%PORTVERSION%%/media/senat.lua
+%%DATADIR%%/%%PORTVERSION%%/media/sevenload.lua
+%%DATADIR%%/%%PORTVERSION%%/media/soundcloud.lua
+%%DATADIR%%/%%PORTVERSION%%/media/spiegel.lua
+%%DATADIR%%/%%PORTVERSION%%/media/tagtele.lua
+%%DATADIR%%/%%PORTVERSION%%/media/tapuz.lua
+%%DATADIR%%/%%PORTVERSION%%/media/ted.lua
+%%DATADIR%%/%%PORTVERSION%%/media/theonion.lua
+%%DATADIR%%/%%PORTVERSION%%/media/tvlux.lua
+%%DATADIR%%/%%PORTVERSION%%/media/videa.lua
+%%DATADIR%%/%%PORTVERSION%%/media/videobash.lua
+%%DATADIR%%/%%PORTVERSION%%/media/vimeo.lua
+%%DATADIR%%/%%PORTVERSION%%/media/vzaar.lua
+%%DATADIR%%/%%PORTVERSION%%/media/youtube.lua
+%%DATADIR%%/%%PORTVERSION%%/playlist/soundcloud.lua
+%%DATADIR%%/%%PORTVERSION%%/playlist/youtube.lua
+%%DATADIR%%/%%PORTVERSION%%/scan/vzaar.lua
+%%DATADIR%%/%%PORTVERSION%%/scan/youtube.lua
+%%DATADIR%%/%%PORTVERSION%%/subtitle/export/subrip.lua
+%%DATADIR%%/%%PORTVERSION%%/subtitle/youtube.lua
+%%DATADIR%%/%%PORTVERSION%%/util/convert_entities.lua
+%%DATADIR%%/%%PORTVERSION%%/util/resolve_redirections.lua
+%%DATADIR%%/%%PORTVERSION%%/util/to_file_ext.lua
+%%DATADIR%%/%%PORTVERSION%%/version