- Update to 1.14.6

- Update pkg-descr
- Strip Makefile header

PR:		ports/172105
Submitted by:	Rusty Nejdl <rnejdl@ringofsaturn.com>
Approved by:	makc (mentor)

5 files changed, 54 insertions, 95 deletions

diff --git a/www/mozplugger/Makefile b/www/mozplugger/Makefile
index 35ccb155f090..66500887028d 100644
--- a/www/mozplugger/Makefile
+++ b/www/mozplugger/Makefile
@@ -1,26 +1,22 @@
-# New ports collection makefile for:   mozplugger
-# Date created:        2 June 2005
-# Whom:                Loren M. Lang <loren@north-winds.org>
-#
+# Created by: Loren M. Lang <loren@north-winds.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mozplugger
-PORTVERSION=	1.14.3
+PORTVERSION=	1.14.6
 CATEGORIES=	www
 MASTER_SITES=	http://mozplugger.mozdev.org/files/
 
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	Framework for loading web content in external viewers
 
+GNU_CONFIGURE=	yes
 USE_XORG=	x11 xt
 MAN7=		mozplugger.7
 SUB_FILES=	pkg-message
-ALL_TARGET=	freebsd
-MAKE_ENV=	WEBPLUGINS_DIR="${WEBPLUGINS_DIR}"
 
 USE_WEBPLUGINS=	native
 WEBPLUGINS_FILES=mozplugger.so
+MAKE_ENV=	WEBPLUGINS_DIR="${WEBPLUGINS_DIR}"
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
diff --git a/www/mozplugger/distinfo b/www/mozplugger/distinfo
index 5a0dd0ab70d4..2e7a8f476a8d 100644
--- a/www/mozplugger/distinfo
+++ b/www/mozplugger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mozplugger-1.14.3.tar.gz) = 2d56f0b224768276b9872499002cfed402ef86ef5c43af70e3466d8aece232f1
-SIZE (mozplugger-1.14.3.tar.gz) = 135099
+SHA256 (mozplugger-1.14.6.tar.gz) = 3fd73b51d1c0b1c310cecac90155a86ef59c748dff677df542e39282ea7ecba7
+SIZE (mozplugger-1.14.6.tar.gz) = 140735
diff --git a/www/mozplugger/files/patch-Makefile b/www/mozplugger/files/patch-Makefile
deleted file mode 100644
index 7a65578592b7..000000000000
--- a/www/mozplugger/files/patch-Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
---- Makefile.orig	2011-03-03 15:40:49.000000000 -0600
-+++ Makefile	2011-03-08 10:37:12.000000000 -0600
-@@ -1,5 +1,5 @@
- # Where is your Xwindows located?
--X11=/usr/X11R6
-+X11=${LOCALBASE}
- 
- #
- # For building rpms
-@@ -7,9 +7,9 @@
- 
- #
- # For installing
--prefix=/usr
--sysconfdir=/etc
--exec_prefix=
-+prefix=${PREFIX}
-+sysconfdir=${prefix}/etc
-+exec_prefix=${PREFIX}
- 
- # On 64 bit arch change libprefix to lib64
- libprefix=/lib
-@@ -20,7 +20,7 @@
- RPMDIR=/usr/src/RPM
- 
- # Choose compiler
--CC=gcc
-+CC?=gcc
- LD=gcc
- BINFORMAT=bin
- 
-@@ -74,10 +74,10 @@
- 	${MAKE} all CC=cc LD=ld XLDFLAGS='-expect_unresolved "*" -shared -msym -O3'
- 
- freebsd-aout:
--	${MAKE} all CC=gcc XCFLAGS='-fPIC -aout' LD=gcc XLDFLAGS='-shared -aout'
-+	${MAKE} all CC=${CC} XCFLAGS='-fPIC -aout' LD=gcc XLDFLAGS='-shared -aout'
- 
- freebsd:
--	${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/
-+	${MAKE} all CC=${CC} XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=${LOCALBASE}
- 
- openbsd:
- 	${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/
-@@ -122,7 +122,7 @@
- 	  mozplugger-controller \
- 	  mozplugger-linker
- 
--DEFINES= -DXP_UNIX -DVERSION=\"$(VERSION)\" -D$(BUILD) -DSYSCONFDIR=\"${sysconfdir}\" #-D__amd64__
-+DEFINES= -DXP_UNIX -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(prefix)\" -D$(BUILD) -DSYSCONFDIR=\"${sysconfdir}\" #-D__amd64__
- INCLUDES= -Inpapi/include -I$(X11)/include
- RPM_OPT_FLAGS ?= -O2
- COMMON_CFLAGS=$(RPM_OPT_FLAGS) $(INCLUDES) $(DEFINES)
-@@ -202,15 +202,15 @@
- 
- install:
- 	-@mkdir -p $(exec_prefix)/bin
--	-@mkdir -p $(prefix)$(libprefix)/mozilla/plugins
--	-@mkdir -p $(exec_prefix)/share/man/man7
-+	-@mkdir -p $(root)${WEBPLUGINS_DIR}
-+	-@mkdir -p $(root)$(prefix)/man/man7
- 	-@mkdir -p ${sysconfdir}
- 	cp mozplugger-helper $(exec_prefix)/bin/
- 	cp mozplugger-controller $(exec_prefix)/bin/
- 	cp mozplugger-linker $(exec_prefix)/bin/
--	cp mozplugger.so $(prefix)$(libprefix)/mozilla/plugins/
-+	cp mozplugger.so $(root)${WEBPLUGINS_DIR}
- 	cp mozpluggerrc ${sysconfdir}/
--	cp mozplugger.7 $(exec_prefix)/share/man/man7/
-+	cp mozplugger.7 $(root)$(prefix)/man/man7/
- 
- mozplugger.tar.gz: $(BASE_FILES) $(SOURCE_FILES)
- 	@( DIR=`pwd`;\
diff --git a/www/mozplugger/files/patch-Makefile.in b/www/mozplugger/files/patch-Makefile.in
new file mode 100644
index 000000000000..97888e2047af
--- /dev/null
+++ b/www/mozplugger/files/patch-Makefile.in
@@ -0,0 +1,44 @@
+--- Makefile.in.orig	2012-09-26 15:43:37.000000000 -0500
++++ Makefile.in	2012-09-26 15:46:01.000000000 -0500
+@@ -22,7 +22,7 @@
+ RPMDIR=/usr/src/RPM
+ 
+ # Choose compiler
+-CC=@CC@
++CC?=@CC@
+ MKDIR=mkdir -p
+ 
+ SOURCE_FILES=mozplugger.c \
+@@ -161,21 +161,20 @@
+ 
+ install:
+ 	-@install -d @bindir@
+-	-@install -d $(prefix)$(libprefix)/mozilla/plugins
++	-@install -d $(root)${WEBPLUGINS_DIR}
+ 	-@install -d @mandir@/man7
+ 	-@install -d @sysconfdir@
+ 	install mozplugger-helper     @bindir@
+ 	install mozplugger-controller @bindir@
+ 	install mozplugger-linker     @bindir@
+-	for a in ${PLUGINDIRS}; do install mozplugger.so $$a ; done
+-#	cp mozplugger.so $(prefix)$(libprefix)/mozilla/plugins/
++	cp mozplugger.so $(root)${WEBPLUGINS_DIR}
+ 	install $(srcdir)/mozpluggerrc  @sysconfdir@
+ 	install $(srcdir)/mozplugger.7  @mandir@/man7/
+ 
+ uninstall:
+ 	rm -f @mandir@/man7/mozplugger.7
+ 	rm -f @sysconfdir@/mozpluggerrc
+-	for target in ${PLUGINDIRS}; do rm -f $${target}/mozplugger.so; done
++	rm -f $(root)${WEBPLUGINS_DIR}/mozplugger.so
+ 	rm -f @bindir@/mozplugger-linker
+ 	rm -f @bindir@/mozplugger-controller
+ 	rm -f @bindir@/mozplugger-helper
+@@ -183,6 +182,7 @@
+ 	-rmdir @mandir@/man7
+ 	-rmdir @mandir@
+ 	-rmdir @bindir@
++	-rmdir $(root)${WEBPLUGINS_DIR}
+ 
+ MOZ_PACKAGE=mozplugger-@PACKAGE_VERSION@
+ 
\ No newline at end of file
diff --git a/www/mozplugger/pkg-descr b/www/mozplugger/pkg-descr
index b18bd680498d..7b09c9d478a4 100644
--- a/www/mozplugger/pkg-descr
+++ b/www/mozplugger/pkg-descr
@@ -1,14 +1,6 @@
-Moxplugger is a multimedia plugin for Unix Netscape 3.0 or later that
-handles Quicktime, MPEG, MP2, AVI, SGI-movie, Tiff, DL, IFF-anim,
-MIDI, Soundtracker, AU, WAV and Commodore 64 audio files.  MPEG audio and
-video can be streamed.
-
-There is also support for viewing word documents and spreadsheets inline
-currently.
-
-Mozplugger is a very small plugin, because plugger uses external programs
-to show/play the different formats.
-
-This is based on Plugger 4.0 as released on Feburary 2003.
+Mozplugger is a small general purpose Mozilla plugin that displays various
+types of media formats found on the Internet in your browser.  It accomplishes
+this by using external programs such as mplayer, timidity, Acrobat Reader,
+OpenOffice, and LibreOffice.
 
 WWW: http://mozplugger.mozdev.org/