Attachment #99104 for bug #138114

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

Lines 6-12 Link Here

(-)Makefile (-1 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= mozplugger	8	PORTNAME= mozplugger
9	PORTVERSION= 1.12.1	9	PORTVERSION= 1.13.0
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://mozplugger.mozdev.org/files/	11	MASTER_SITES= http://mozplugger.mozdev.org/files/
12		12
Lines 26-31 Link Here
26	.include "${PORTSDIR}/www/firefox/Makefile.webplugins"	26	.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
27		27
28	post-patch:	28	post-patch:
		29
29	@${REINPLACE_CMD} -e 's\|"/etc\|"${PREFIX}/etc\|g' \	30	@${REINPLACE_CMD} -e 's\|"/etc\|"${PREFIX}/etc\|g' \
30	${WRKSRC}/mozplugger.c	31	${WRKSRC}/mozplugger.c
31		32

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (mozplugger-1.12.1.tar.gz) = 30010bc1028a90aa1a87a39f8c7a5910	1	MD5 (mozplugger-1.13.0.tar.gz) = 8903bb60a7ff89cdce399424c18faf59
2	SHA256 (mozplugger-1.12.1.tar.gz) = 97fa713033f0d31c36800c5d850dbf3e4ae95816b40edf8fe71122b773c1c646	2	SHA256 (mozplugger-1.13.0.tar.gz) = b2b15a5a183c6d576419594d76fab73319450004e723f762b247a3d18010a081
3	SIZE (mozplugger-1.12.1.tar.gz) = 86874	3	SIZE (mozplugger-1.13.0.tar.gz) = 378880




--- Makefile.orig	2009-08-23 15:36:38.000000000 -0300
+++ Makefile	2009-08-23 15:49:33.000000000 -0300
@@ -1,5 +1,5 @@
 # Where is your Xwindows located?
-X11=/usr/X11R6

 
 #
 # For building rpms
@@ -7,7 +7,7 @@
 
 #
 # For installing
-prefix=/usr
+prefix=${PREFIX}
 
 # On 64 bit arch change libprefix to lib64
 libprefix=/lib
@@ -18,7 +18,7 @@
 RPMDIR=/usr/src/RPM
 
 # Choose compiler

 LD=gcc
 BINFORMAT=bin
 
@@ -71,10 +71,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/

 
 openbsd:
 	${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/
@@ -119,7 +119,7 @@
 	  mozplugger-controller \
 	  mozplugger-linker
 

 INCLUDES= -Inpapi/include -I$(X11)/include
 RPM_OPT_FLAGS ?= -O2
 COMMON_CFLAGS=$(RPM_OPT_FLAGS) $(INCLUDES) $(DEFINES)
@@ -190,15 +190,15 @@
 
 install:
 	-@mkdir -p $(root)$(prefix)/bin
-	-@mkdir -p $(root)$(prefix)$(libprefix)/mozilla/plugins
-	-@mkdir -p $(root)$(prefix)/share/man/man7
-	-@mkdir -p $(root)/etc
+	-@mkdir -p $(root)${WEBPLUGINS_DIR}
+	-@mkdir -p $(root)$(prefix)/man/man7
+	-@mkdir -p $(root)${prefix}/etc
 	cp mozplugger-helper $(root)$(prefix)/bin/
 	cp mozplugger-controller $(root)$(prefix)/bin/
 	cp mozplugger-linker $(root)$(prefix)/bin/
-	cp mozplugger.so $(root)$(prefix)$(libprefix)/mozilla/plugins/
-	cp mozpluggerrc $(root)/etc/
-	cp mozplugger.7 $(root)$(prefix)/share/man/man7/
+	cp mozplugger.so $(root)${WEBPLUGINS_DIR}
+	cp mozpluggerrc $(root)$(prefix)/etc/
+	cp mozplugger.7 $(root)$(prefix)/man/man7/

Return to bug 138114

Lines 1-5 Link Here

(-)files/patch-Makefile (-13 / +18 lines)
1	--- Makefile.orig 2008-10-04 16:12:18.000000000 -0500	1	--- Makefile.orig 2009-08-23 15:36:38.000000000 -0300
2	+++ Makefile 2008-10-04 16:14:19.000000000 -0500	2	+++ Makefile 2009-08-23 15:49:33.000000000 -0300
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	# Where is your Xwindows located?	4	# Where is your Xwindows located?
5	-X11=/usr/X11R6	5	-X11=/usr/X11R6
Lines 7-21 Link Here
7		7
8	#	8	#
9	# For building rpms	9	# For building rpms
10	@@ -7,14 +7,14 @@	10	@@ -7,7 +7,7 @@
11		11
12	#	12	#
13	# For installing	13	# For installing
14	-prefix=/usr	14	-prefix=/usr
15	+prefix=${PREFIX}	15	+prefix=${PREFIX}
16		16
17	#	17	# On 64 bit arch change libprefix to lib64
18	#	18	libprefix=/lib
		19	@@ -18,7 +18,7 @@
19	RPMDIR=/usr/src/RPM	20	RPMDIR=/usr/src/RPM
20		21
21	# Choose compiler	22	# Choose compiler
Lines 24-31 Link Here
24	LD=gcc	25	LD=gcc
25	BINFORMAT=bin	26	BINFORMAT=bin
26		27
27	@@ -70,7 +70,7 @@	28	@@ -71,10 +71,10 @@
28	${MAKE} all CC=gcc XCFLAGS='-fPIC -aout' LD=gcc XLDFLAGS='-shared -aout'	29	${MAKE} all CC=cc LD=ld XLDFLAGS='-expect_unresolved "*" -shared -msym -O3'
		30
		31	freebsd-aout:
		32	- ${MAKE} all CC=gcc XCFLAGS='-fPIC -aout' LD=gcc XLDFLAGS='-shared -aout'
		33	+ ${MAKE} all CC=${CC} XCFLAGS='-fPIC -aout' LD=gcc XLDFLAGS='-shared -aout'
29		34
30	freebsd:	35	freebsd:
31	- ${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/	36	- ${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/
Lines 33-39 Link Here
33		38
34	openbsd:	39	openbsd:
35	${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/	40	${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/
36	@@ -114,7 +114,7 @@	41	@@ -119,7 +119,7 @@
37	mozplugger-controller \	42	mozplugger-controller \
38	mozplugger-linker	43	mozplugger-linker
39		44
Lines 42-64 Link Here
42	INCLUDES= -Inpapi/include -I$(X11)/include	47	INCLUDES= -Inpapi/include -I$(X11)/include
43	RPM_OPT_FLAGS ?= -O2	48	RPM_OPT_FLAGS ?= -O2
44	COMMON_CFLAGS=$(RPM_OPT_FLAGS) $(INCLUDES) $(DEFINES)	49	COMMON_CFLAGS=$(RPM_OPT_FLAGS) $(INCLUDES) $(DEFINES)
45	@@ -185,15 +185,15 @@	50	@@ -190,15 +190,15 @@
46		51
47	install:	52	install:
48	-@mkdir -p $(root)$(prefix)/bin	53	-@mkdir -p $(root)$(prefix)/bin
49	- -@mkdir -p $(root)$(prefix)/lib/mozilla/plugins	54	- -@mkdir -p $(root)$(prefix)$(libprefix)/mozilla/plugins
50	- -@mkdir -p $(root)$(prefix)/share/man/man7	55	- -@mkdir -p $(root)$(prefix)/share/man/man7
51	- -@mkdir -p $(root)/etc	56	- -@mkdir -p $(root)/etc
52	+ -@mkdir -p $(root)${WEBPLUGINS_DIR}	57	+ -@mkdir -p $(root)${WEBPLUGINS_DIR}
53	+ -@mkdir -p $(root)$(prefix)/man/man7	58	+ -@mkdir -p $(root)$(prefix)/man/man7
54	+ -@mkdir -p $(root)$(prefix)/etc	59	+ -@mkdir -p $(root)${prefix}/etc
55	cp mozplugger-helper $(root)$(prefix)/bin/	60	cp mozplugger-helper $(root)$(prefix)/bin/
56	cp mozplugger-controller $(root)$(prefix)/bin/	61	cp mozplugger-controller $(root)$(prefix)/bin/
57	cp mozplugger-linker $(root)$(prefix)/bin/	62	cp mozplugger-linker $(root)$(prefix)/bin/
58	- cp mozplugger.so $(root)$(prefix)/lib/mozilla/plugins/	63	- cp mozplugger.so $(root)$(prefix)$(libprefix)/mozilla/plugins/
59	- cp mozpluggerrc $(root)/etc/	64	- cp mozpluggerrc $(root)/etc/
60	- cp mozplugger.7 $(root)$(prefix)/share/man/man7/	65	- cp mozplugger.7 $(root)$(prefix)/share/man/man7/
61	+ cp mozplugger.so $(root)${WEBPLUGINS_DIR}/	66	+ cp mozplugger.so $(root)${WEBPLUGINS_DIR}
62	+ cp mozpluggerrc $(root)$(prefix)/etc/	67	+ cp mozpluggerrc $(root)$(prefix)/etc/
63	+ cp mozplugger.7 $(root)$(prefix)/man/man7/	68	+ cp mozplugger.7 $(root)$(prefix)/man/man7/