Date: Wed, 26 Sep 2012 18:41:05 -0500 (CDT) From: Rusty Nejdl <rnejdl@ringofsaturn.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172105: Update www/mozplugger to 1.14.6 Message-ID: <assp.0616efdb6e.201209262341.q8QNf53P089730@tethys.ringofsaturn.com> Resent-Message-ID: <201209262350.q8QNo5ck065229@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172105 >Category: ports >Synopsis: Update www/mozplugger to 1.14.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Sep 26 23:50:05 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Rusty Nejdl >Release: FreeBSD 9.1-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD tethys.ringofsaturn.com 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0: Sun Sep 23 15:41:42 CDT 2012 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/GENERIC amd64 >Description: This updates mozplugger to 1.14.6. The previous diff file I sent in was bad because I diffed against a non cleaned original version of the port. >How-To-Repeat: >Fix: --- mozplugger-1.14.6.diff begins here --- diff -ruN mozplugger/Makefile mozplugger.new/Makefile --- mozplugger/Makefile 2011-03-09 02:47:34.000000000 -0600 +++ mozplugger.new/Makefile 2012-09-26 15:35:13.000000000 -0500 @@ -6,21 +6,21 @@ # 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 -ruN mozplugger/distinfo mozplugger.new/distinfo --- mozplugger/distinfo 2011-03-03 16:52:17.000000000 -0600 +++ mozplugger.new/distinfo 2012-09-26 11:35:52.000000000 -0500 @@ -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 -ruN mozplugger/files/patch-Makefile mozplugger.new/files/patch-Makefile --- mozplugger/files/patch-Makefile 2011-03-08 10:37:48.000000000 -0600 +++ mozplugger.new/files/patch-Makefile 1969-12-31 18:00:00.000000000 -0600 @@ -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 -ruN mozplugger/files/patch-Makefile.in mozplugger.new/files/patch-Makefile.in --- mozplugger/files/patch-Makefile.in 1969-12-31 18:00:00.000000000 -0600 +++ mozplugger.new/files/patch-Makefile.in 2012-09-26 15:46:11.000000000 -0500 @@ -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@ + --- mozplugger-1.14.6.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?assp.0616efdb6e.201209262341.q8QNf53P089730>