- Fix bug where upgrading port results in missing files[1]

- Use OptionsNG helpers
- Fix spacing in WWW line in pkg-descr to comply with portlint

Reported by:	Ole <ole at coalmont.net>[1]

4 files changed, 14 insertions, 37 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index d90a40a1c52b..7a8f945795aa 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvpx
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
@@ -30,39 +31,24 @@ RUNTIME_DESC=	Enable runtime CPU detection
 SHARED_DESC=	Enable shared-library support
 
 ALL_TARGET=
-CONFIGURE_ARGS+=	--enable-pic --disable-install-srcs --enable-vp8 --disable-install-docs
-MAKE_ARGS+=	DIST_DIR=${PREFIX} verbose=yes DESTDIR=${STAGEDIR}
+CONFIGURE_ARGS+=	--enable-pic --disable-install-srcs --enable-vp8 --disable-install-docs --prefix=${PREFIX}
+MAKE_ARGS+=	verbose=yes
 MAKE_ENV=	LC_ALL=C
 
+OPTIONS_SUB=		SHARED
+
+DEBUG_CONFIGURE_ON=	--enable-debug
+POSTPROC_CONFIGURE_ON=	--enable-postproc
+RUNTIME_CONFIGURE_ON=	--enable-runtime-cpu-detect
+THREADS_CONFIGURE_OFF=	--disable-multithread
+SHARED_CONFIGURE_ON=	--enable-shared
+
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} >= 1000000
 CONFIGURE_ARGS+=	--disable-unit-tests
 .endif
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MPOSTPROC}
-CONFIGURE_ARGS+=	--enable-postproc
-.endif
-
-.if ${PORT_OPTIONS:MRUNTIME}
-CONFIGURE_ARGS+=	--enable-runtime-cpu-detect
-.endif
-
-.if ! ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=	--disable-multithread
-.endif
-
-.if ${PORT_OPTIONS:MSHARED}
-CONFIGURE_ARGS+=	--enable-shared
-PLIST_SUB+=	SHARED=""
-.else
-PLIST_SUB+=	SHARED="@comment "
-.endif
-
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=	--target=x86_64-linux-gcc
 .elif ${ARCH} == "i386"
diff --git a/multimedia/libvpx/files/patch-build_make_Makefile b/multimedia/libvpx/files/patch-build_make_Makefile
index 68609ffff779..6ae9142cb85f 100644
--- a/multimedia/libvpx/files/patch-build_make_Makefile
+++ b/multimedia/libvpx/files/patch-build_make_Makefile
@@ -9,8 +9,8 @@ $FreeBSD$
  	$(if $(quiet),@echo "    [INSTALL] $$@")
 -	$(qexec)mkdir -p $$(dir $$@)
 -	$(qexec)cp -p $$< $$@
-+	$(qexec)install -d %%DESTDIR%%$$(dir $$@)
-+	$(qexec)install -p $$< %%DESTDIR%%$$(dir $$@)
++	$(qexec)install -d $$(dir $$@)
++	$(qexec)install -p $$< $$(dir $$@)
  endef
  
  define archive_template
diff --git a/multimedia/libvpx/files/patch-libs.mk b/multimedia/libvpx/files/patch-libs.mk
index a6cfaf19facd..ba42da48d5f4 100644
--- a/multimedia/libvpx/files/patch-libs.mk
+++ b/multimedia/libvpx/files/patch-libs.mk
@@ -3,15 +3,6 @@ $FreeBSD$
 
 --- libs.mk.orig
 +++ libs.mk
-@@ -209,7 +209,7 @@
-     $(addprefix $(BUILD_PFX),$(notdir $(LIBVPX_SO_SYMLINKS))),\
-     $(BUILD_PFX)$(LIBVPX_SO)))
- $(eval $(call libvpx_symlink_template,\
--    $(addprefix $(DIST_DIR)/,$(LIBVPX_SO_SYMLINKS)),\
-+    $(addprefix $(DESTDIR)/$(DIST_DIR)/,$(LIBVPX_SO_SYMLINKS)),\
-     $(DIST_DIR)/$(LIBSUBDIR)/$(LIBVPX_SO)))
- 
- INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBVPX_SO_SYMLINKS)
 @@ -232,8 +232,8 @@
  	$(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
  	$(qexec)echo 'Libs.private: -lm -pthread' >> $@
diff --git a/multimedia/libvpx/pkg-descr b/multimedia/libvpx/pkg-descr
index e3aeb4b9bdf8..497550de16cc 100644
--- a/multimedia/libvpx/pkg-descr
+++ b/multimedia/libvpx/pkg-descr
@@ -1,3 +1,3 @@
 libvpx is the VP8 Codec SDK.
 
-WWW:	http://www.webmproject.org/
+WWW: http://www.webmproject.org/