Attachment #128227 for bug #172105

View | Details | Raw Unified | Return to bug 172105
Collapse All | Expand All




#

PORTNAME=	mozplugger
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"

Lines 1-2 Link Here

(-)mozplugger.new/distinfo (-2 / +2 lines)
1	SHA256 (mozplugger-1.14.3.tar.gz) = 2d56f0b224768276b9872499002cfed402ef86ef5c43af70e3466d8aece232f1	1	SHA256 (mozplugger-1.14.6.tar.gz) = 3fd73b51d1c0b1c310cecac90155a86ef59c748dff677df542e39282ea7ecba7
2	SIZE (mozplugger-1.14.3.tar.gz) = 135099	2	SIZE (mozplugger-1.14.6.tar.gz) = 140735




--- 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`;\




--- 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@
 

Return to bug 172105

Lines 6-26 Link Here

(-)mozplugger.new/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= mozplugger	8	PORTNAME= mozplugger
9	PORTVERSION= 1.14.3	9	PORTVERSION= 1.14.6
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://mozplugger.mozdev.org/files/	11	MASTER_SITES= http://mozplugger.mozdev.org/files/
12		12
13	MAINTAINER= rnejdl@ringofsaturn.com	13	MAINTAINER= rnejdl@ringofsaturn.com
14	COMMENT= Framework for loading web content in external viewers	14	COMMENT= Framework for loading web content in external viewers
15		15
		16	GNU_CONFIGURE= yes
16	USE_XORG= x11 xt	17	USE_XORG= x11 xt
17	MAN7= mozplugger.7	18	MAN7= mozplugger.7
18	SUB_FILES= pkg-message	19	SUB_FILES= pkg-message
19	ALL_TARGET= freebsd
20	MAKE_ENV= WEBPLUGINS_DIR="${WEBPLUGINS_DIR}"
21		20
22	USE_WEBPLUGINS= native	21	USE_WEBPLUGINS= native
23	WEBPLUGINS_FILES=mozplugger.so	22	WEBPLUGINS_FILES=mozplugger.so
		23	MAKE_ENV= WEBPLUGINS_DIR="${WEBPLUGINS_DIR}"
24		24
25	.include <bsd.port.pre.mk>	25	.include <bsd.port.pre.mk>
26	.include "${PORTSDIR}/www/firefox/Makefile.webplugins"	26	.include "${PORTSDIR}/www/firefox/Makefile.webplugins"

Lines 1-73 Link Here

(-)mozplugger.new/files/patch-Makefile (-73 lines)
1	--- Makefile.orig 2011-03-03 15:40:49.000000000 -0600
2	+++ Makefile 2011-03-08 10:37:12.000000000 -0600
3	@@ -1,5 +1,5 @@
4	# Where is your Xwindows located?
5	-X11=/usr/X11R6
6	+X11=${LOCALBASE}
7
8	#
9	# For building rpms
10	@@ -7,9 +7,9 @@
11
12	#
13	# For installing
14	-prefix=/usr
15	-sysconfdir=/etc
16	-exec_prefix=
17	+prefix=${PREFIX}
18	+sysconfdir=${prefix}/etc
19	+exec_prefix=${PREFIX}
20
21	# On 64 bit arch change libprefix to lib64
22	libprefix=/lib
23	@@ -20,7 +20,7 @@
24	RPMDIR=/usr/src/RPM
25
26	# Choose compiler
27	-CC=gcc
28	+CC?=gcc
29	LD=gcc
30	BINFORMAT=bin
31
32	@@ -74,10 +74,10 @@
33	${MAKE} all CC=cc LD=ld XLDFLAGS='-expect_unresolved "*" -shared -msym -O3'
34
35	freebsd-aout:
36	- ${MAKE} all CC=gcc XCFLAGS='-fPIC -aout' LD=gcc XLDFLAGS='-shared -aout'
37	+ ${MAKE} all CC=${CC} XCFLAGS='-fPIC -aout' LD=gcc XLDFLAGS='-shared -aout'
38
39	freebsd:
40	- ${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/
41	+ ${MAKE} all CC=${CC} XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=${LOCALBASE}
42
43	openbsd:
44	${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/
45	@@ -122,7 +122,7 @@
46	mozplugger-controller \
47	mozplugger-linker
48
49	-DEFINES= -DXP_UNIX -DVERSION=\"$(VERSION)\" -D$(BUILD) -DSYSCONFDIR=\"${sysconfdir}\" #-D__amd64__
50	+DEFINES= -DXP_UNIX -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(prefix)\" -D$(BUILD) -DSYSCONFDIR=\"${sysconfdir}\" #-D__amd64__
51	INCLUDES= -Inpapi/include -I$(X11)/include
52	RPM_OPT_FLAGS ?= -O2
53	COMMON_CFLAGS=$(RPM_OPT_FLAGS) $(INCLUDES) $(DEFINES)
54	@@ -202,15 +202,15 @@
55
56	install:
57	-@mkdir -p $(exec_prefix)/bin
58	- -@mkdir -p $(prefix)$(libprefix)/mozilla/plugins
59	- -@mkdir -p $(exec_prefix)/share/man/man7
60	+ -@mkdir -p $(root)${WEBPLUGINS_DIR}
61	+ -@mkdir -p $(root)$(prefix)/man/man7
62	-@mkdir -p ${sysconfdir}
63	cp mozplugger-helper $(exec_prefix)/bin/
64	cp mozplugger-controller $(exec_prefix)/bin/
65	cp mozplugger-linker $(exec_prefix)/bin/
66	- cp mozplugger.so $(prefix)$(libprefix)/mozilla/plugins/
67	+ cp mozplugger.so $(root)${WEBPLUGINS_DIR}
68	cp mozpluggerrc ${sysconfdir}/
69	- cp mozplugger.7 $(exec_prefix)/share/man/man7/
70	+ cp mozplugger.7 $(root)$(prefix)/man/man7/
71
72	mozplugger.tar.gz: $(BASE_FILES) $(SOURCE_FILES)
73	@( DIR=`pwd`;\

Line 0 Link Here

(-)mozplugger.new/files/patch-Makefile.in (+44 lines)
	1	--- Makefile.in.orig 2012-09-26 15:43:37.000000000 -0500
	2	+++ Makefile.in 2012-09-26 15:46:01.000000000 -0500
	3	@@ -22,7 +22,7 @@
	4	RPMDIR=/usr/src/RPM
	5
	6	# Choose compiler
	7	-CC=@CC@
	8	+CC?=@CC@
	9	MKDIR=mkdir -p
	10
	11	SOURCE_FILES=mozplugger.c \
	12	@@ -161,21 +161,20 @@
	13
	14	install:
	15	-@install -d @bindir@
	16	- -@install -d $(prefix)$(libprefix)/mozilla/plugins
	17	+ -@install -d $(root)${WEBPLUGINS_DIR}
	18	-@install -d @mandir@/man7
	19	-@install -d @sysconfdir@
	20	install mozplugger-helper @bindir@
	21	install mozplugger-controller @bindir@
	22	install mozplugger-linker @bindir@
	23	- for a in ${PLUGINDIRS}; do install mozplugger.so $$a ; done
	24	-# cp mozplugger.so $(prefix)$(libprefix)/mozilla/plugins/
	25	+ cp mozplugger.so $(root)${WEBPLUGINS_DIR}
	26	install $(srcdir)/mozpluggerrc @sysconfdir@
	27	install $(srcdir)/mozplugger.7 @mandir@/man7/
	28
	29	uninstall:
	30	rm -f @mandir@/man7/mozplugger.7
	31	rm -f @sysconfdir@/mozpluggerrc
	32	- for target in ${PLUGINDIRS}; do rm -f $${target}/mozplugger.so; done
	33	+ rm -f $(root)${WEBPLUGINS_DIR}/mozplugger.so
	34	rm -f @bindir@/mozplugger-linker
	35	rm -f @bindir@/mozplugger-controller
	36	rm -f @bindir@/mozplugger-helper
	37	@@ -183,6 +182,7 @@
	38	-rmdir @mandir@/man7
	39	-rmdir @mandir@
	40	-rmdir @bindir@
	41	+ -rmdir $(root)${WEBPLUGINS_DIR}
	42
	43	MOZ_PACKAGE=mozplugger-@PACKAGE_VERSION@
	44