- Update to 1.13.0.

PR:		ports/138114
Submitted by:	Sylvio Cesar <scjamorim@bsd.com.br>
Approved by:	Rusty Nejdl <rnejdl@ringofsaturn.com> (maintainer)

3 files changed, 23 insertions, 17 deletions

diff --git a/www/mozplugger/Makefile b/www/mozplugger/Makefile
index b3ba83e59815..214dc792fbc6 100644
--- a/www/mozplugger/Makefile
+++ b/www/mozplugger/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozplugger
-PORTVERSION=	1.12.1
+PORTVERSION=	1.13.0
 CATEGORIES=	www
 MASTER_SITES=	http://mozplugger.mozdev.org/files/
 
@@ -26,6 +26,7 @@ WEBPLUGINS_FILES=mozplugger.so
 .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 
 post-patch:
+
 	@${REINPLACE_CMD} -e 's|"/etc|"${PREFIX}/etc|g' \
 		${WRKSRC}/mozplugger.c
 
diff --git a/www/mozplugger/distinfo b/www/mozplugger/distinfo
index d3d29310dacb..90988a4983d4 100644
--- a/www/mozplugger/distinfo
+++ b/www/mozplugger/distinfo
@@ -1,3 +1,3 @@
-MD5 (mozplugger-1.12.1.tar.gz) = 30010bc1028a90aa1a87a39f8c7a5910
-SHA256 (mozplugger-1.12.1.tar.gz) = 97fa713033f0d31c36800c5d850dbf3e4ae95816b40edf8fe71122b773c1c646
-SIZE (mozplugger-1.12.1.tar.gz) = 86874
+MD5 (mozplugger-1.13.0.tar.gz) = 8903bb60a7ff89cdce399424c18faf59
+SHA256 (mozplugger-1.13.0.tar.gz) = b2b15a5a183c6d576419594d76fab73319450004e723f762b247a3d18010a081
+SIZE (mozplugger-1.13.0.tar.gz) = 378880
diff --git a/www/mozplugger/files/patch-Makefile b/www/mozplugger/files/patch-Makefile
index a7383100fb67..91e7225f3172 100644
--- a/www/mozplugger/files/patch-Makefile
+++ b/www/mozplugger/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2008-10-04 16:12:18.000000000 -0500
-+++ Makefile	2008-10-04 16:14:19.000000000 -0500
+--- 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
@@ -7,15 +7,16 @@
  
  #
  # For building rpms
-@@ -7,14 +7,14 @@
+@@ -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
@@ -24,8 +25,12 @@
  LD=gcc
  BINFORMAT=bin
  
-@@ -70,7 +70,7 @@
- 	${MAKE} all CC=gcc XCFLAGS='-fPIC -aout' LD=gcc XLDFLAGS='-shared -aout'
+@@ -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/
@@ -33,7 +38,7 @@
  
  openbsd:
  	${MAKE} all CC=gcc XCFLAGS=-fPIC LD=gcc XLDFLAGS=-shared X11=/usr/X11R6/
-@@ -114,7 +114,7 @@
+@@ -119,7 +119,7 @@
  	  mozplugger-controller \
  	  mozplugger-linker
  
@@ -42,23 +47,23 @@
  INCLUDES= -Inpapi/include -I$(X11)/include
  RPM_OPT_FLAGS ?= -O2
  COMMON_CFLAGS=$(RPM_OPT_FLAGS) $(INCLUDES) $(DEFINES)
-@@ -185,15 +185,15 @@
+@@ -190,15 +190,15 @@
  
  install:
  	-@mkdir -p $(root)$(prefix)/bin
--	-@mkdir -p $(root)$(prefix)/lib/mozilla/plugins
+-	-@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
++	-@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)/lib/mozilla/plugins/
+-	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 mozplugger.so $(root)${WEBPLUGINS_DIR}
 +	cp mozpluggerrc $(root)$(prefix)/etc/
 +	cp mozplugger.7 $(root)$(prefix)/man/man7/