Upgrade to version 1.2.8 to fix c++ errors on CURRENT.

Pointed out by:		kris (bento)

9 files changed, 64 insertions, 104 deletions

diff --git a/security/saferpay/Makefile b/security/saferpay/Makefile
index 1f9bfca6a7e6..6f21d83fcb79 100644
--- a/security/saferpay/Makefile
+++ b/security/saferpay/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	saferpay
-PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTVERSION=	1.2.8
 CATEGORIES=	security
 MASTER_SITES=	http://www.saferpay.com/download/
 DISTFILES=	${PORTNAME}_${PORTVERSION}_linux-g++_src.tar.gz
@@ -21,6 +20,9 @@ USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}
 
+post-patch:
+	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/saferpay/Makefile
+
 .if !defined(WITH_P5_API)
 pre-build:
 	@${ECHO} "-----------------------------------------------------"
@@ -35,6 +37,8 @@ post-build:
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} xs)
 post-install:
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} installxs)
+	${GZIP_CMD} ${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/../man/man3/soplex::saferpay::MessageObject.3
+	${GZIP_CMD} ${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/../man/man3/soplex::saferpay::MessageFactory.3
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/saferpay/distinfo b/security/saferpay/distinfo
index 3d36b2ff87c2..99d7baa96308 100644
--- a/security/saferpay/distinfo
+++ b/security/saferpay/distinfo
@@ -1 +1 @@
-MD5 (saferpay_1.2.2_linux-g++_src.tar.gz) = 7463db3eee0d5ae5cca0616b6645e704
+MD5 (saferpay_1.2.8_linux-g++_src.tar.gz) = 7147967b96ca0fc924074eb5879a8e3a
diff --git a/security/saferpay/files/patch-Makefile b/security/saferpay/files/patch-Makefile
index 62a214138c61..9c29ad738227 100644
--- a/security/saferpay/files/patch-Makefile
+++ b/security/saferpay/files/patch-Makefile
@@ -1,33 +1,28 @@
---- saferpay/Makefile.orig	Thu Sep  6 00:19:01 2001
-+++ saferpay/Makefile	Thu Sep  6 00:21:22 2001
-@@ -1,47 +1,35 @@
+--- saferpay/Makefile.orig	Thu Aug  8 15:59:09 2002
++++ saferpay/Makefile	Tue Feb 18 17:28:00 2003
+@@ -1,45 +1,37 @@
 -PREFIX = /usr
--SSLEAYDIR = SSLeay-0.9.0
--SSLEAY = $(SSLEAYDIR)-patch1
+-SSLVERSION = openssl-0.9.6c
+-SSLEAYDIR = ../$(SSLVERSION)
 -
++PREFIX = %%PREFIX%%
+ 
  all:
--	make SSLeay
--	cp ./ssl/$(SSLEAYDIR)/libssl.a ./ssl
--	cp ./ssl/$(SSLEAYDIR)/libcrypto.a ./ssl
+-
 -	make -f idpapp.mk
 -	cp ./out/libidpapp.s* $(PREFIX)/lib
 -	make -f saferpay.mk
 -	cp idpapi.h ./out
 -	cp idperrc.h ./out
 -	cp ./out/settings.template ./out/settings.xml
--
--SSLeay:
--	cd ssl; gunzip -c $(SSLEAY).tar.gz > $(SSLEAY).tar; tar xf $(SSLEAY).tar; cd $(SSLEAYDIR); perl Configure linux-elf; make; cd ..; cd ..; 
 +	gmake -f idpapp.mk -C saferpay
 +	gmake -f saferpay.mk -C saferpay
  
  clean:
 -	make -f idpapp.mk clean
 -	make -f saferpay.mk clean
--	-rm -R ssl/$(SSLEAYDIR)
--	-rm ssl/$(SSLEAY).tar;
-+	gmake -f idpapp.mk -C saferpay clean
-+	gmake -f saferpay.mk -C saferpay clean
++	gmake -f idpapp.mk clean
++	gmake -f saferpay.mk clean
  
  xs: all
 -	perl -e 'system("cd perl/MessageObject\nperl Makefile.PL\nmake");'
@@ -38,31 +33,35 @@
 +	perl -e 'system("cd saferpay/perl/ConfigurationSetup\nperl Makefile.PL\nmake");'
  
  testxs:
--	make -C perl/ConfigurationSetup test
--	make -C perl/MessageFactory test
-+	gmake -C saferpay/perl/ConfigurationSetup test
-+	gmake -C saferpay/perl/MessageFactory test
+-	perl -e 'system("cd perl/ConfigurationSetup\nmake test");'
+-	perl -e 'system("cd perl/MessageFactory\nmake test");'
++	perl -e 'system("cd saferpay/perl/ConfigurationSetup\nmake test");'
++	perl -e 'system("cd saferpay/perl/MessageFactory\nmake test");'
  
  installxs:
--	make -C perl/ConfigurationSetup install
--	make -C perl/MessageFactory install
--	make -C perl/MessageObject install
-+	gmake -C saferpay/perl/ConfigurationSetup install
-+	gmake -C saferpay/perl/MessageFactory install
-+	gmake -C saferpay/perl/MessageObject install
+-	perl -e 'system("cd perl/ConfigurationSetup\nmake install");'
+-	perl -e 'system("cd perl/MessageFactory\nmake install");'
+-	perl -e 'system("cd perl/MessageObject\nmake install");'
++	perl -e 'system("cd saferpay/perl/ConfigurationSetup\nmake install");'
++	perl -e 'system("cd saferpay/perl/MessageFactory\nmake install");'
++	perl -e 'system("cd saferpay/perl/MessageObject\nmake install");'
  
  cleanxs:
--	make -C perl/ConfigurationSetup clean
--	make -C perl/MessageFactory clean
--	make -C perl/MessageObject clean
+-	perl -e 'system("cd perl/ConfigurationSetup\nmake clean");'
+-	perl -e 'system("cd perl/MessageFactory\nmake clean");'
+-	perl -e 'system("cd perl/MessageObject\nmake clean");'
+-	
+-testmk:
+-	echo "SSLVERSION: $(SSLVERSION)"
+-	echo "SSLEAYDIR: $(SSLEAYDIR)"
 -
 -
 -
 -
 -
-+	gmake -C saferpay/perl/ConfigurationSetup clean
-+	gmake -C saferpay/perl/MessageFactory clean
-+	gmake -C saferpay/perl/MessageObject clean
++	perl -e 'system("cd saferpay/perl/ConfigurationSetup\nmake clean");'
++	perl -e 'system("cd saferpay/perl/MessageFactory\nmake clean");'
++	perl -e 'system("cd saferpay/perl/MessageObject\nmake clean");'
 +
 +install:
 +	install -C saferpay/out/libidpapp.so.1.0.0 $(PREFIX)/lib/libidpapp.so.1
diff --git a/security/saferpay/files/patch-idpapp.mk b/security/saferpay/files/patch-idpapp.mk
deleted file mode 100644
index 05b41eb71b0b..000000000000
--- a/security/saferpay/files/patch-idpapp.mk
+++ /dev/null
@@ -1,24 +0,0 @@
---- saferpay/idpapp.mk.orig	Fri Dec 15 02:54:02 2000
-+++ saferpay/idpapp.mk	Wed Sep 12 07:07:24 2001
-@@ -7,14 +7,14 @@
- 
- ####### Compiler, tools and options
- 
--CC	=	gcc
--CXX	=	g++
--CFLAGS	=	-pipe -DUNIX -DHAVE_UNISTD_H -DHAVE_STDLIB_H -O2 -fPIC
--CXXFLAGS=	-pipe -DUNIX -O2 -fPIC
--INCPATH	=	-I"./xml" -I"./jni" -I"./ssl" -I"./sxfc"
--LINK	=	g++
-+#CC	=	gcc
-+#CXX	=	g++
-+CFLAGS	+=	-DUNIX -DHAVE_UNISTD_H -DHAVE_STDLIB_H -fPIC
-+CXXFLAGS+=	-DUNIX -fPIC
-+INCPATH	=	-I"./xml" -I"./jni" -I"/usr/include/openssl/" -I"./sxfc"
-+LINK	=	$(CXX)
- LFLAGS	=	-fPIC -shared -Wl,-soname,libidpapp.so.1
--LIBS	=	./ssl/libssl.a ./ssl/libcrypto.a
-+LIBS	=	/usr/lib/libssl.a /usr/lib/libcrypto.a
- AR	=	ar cqs
- RANLIB	=	
- MOC	=	$(QTDIR)/bin/moc
diff --git a/security/saferpay/files/patch-idphttp.cpp b/security/saferpay/files/patch-idphttp.cpp
deleted file mode 100644
index fa9a373049a7..000000000000
--- a/security/saferpay/files/patch-idphttp.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- saferpay/idphttp.cpp.orig	Wed Jan 10 15:23:12 2001
-+++ saferpay/idphttp.cpp	Mon Jul 30 13:33:13 2001
-@@ -368,7 +368,7 @@
- public:
- 	SslConnection()
- 	{
--		SSLeay_add_ssl_algorithms();
-+		SSL_library_init();
- 		SSL_load_error_strings();
- 
- 		ctx = SSL_CTX_new(SSLv23_method());
diff --git a/security/saferpay/files/patch-saferpay.c b/security/saferpay/files/patch-saferpay.c
index 0d40dcc4cee9..f3221c6024c2 100644
--- a/security/saferpay/files/patch-saferpay.c
+++ b/security/saferpay/files/patch-saferpay.c
@@ -1,11 +1,11 @@
---- saferpay/saferpay.c.orig	Wed Sep  5 17:05:15 2001
-+++ saferpay/saferpay.c	Wed Sep  5 17:05:27 2001
+--- saferpay/saferpay.c.orig	Tue Feb 18 16:51:58 2003
++++ saferpay/saferpay.c	Tue Feb 18 16:52:14 2003
 @@ -3,7 +3,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "idpapi.h"
- #include "idperrc.h"
- 
+ #include <stdio.h>

+ #include <errno.h>

+ #include <string.h>

+-#include <malloc.h>

++#include <stdlib.h>

+ #include "idpapi.h"

+ #include "idperrc.h"

+ 

diff --git a/security/saferpay/files/patch-saferpay.mk b/security/saferpay/files/patch-saferpay.mk
index 6aa0ccd615aa..e1f4f05c6e83 100644
--- a/security/saferpay/files/patch-saferpay.mk
+++ b/security/saferpay/files/patch-saferpay.mk
@@ -1,22 +1,25 @@
---- saferpay/saferpay.mk.orig	Fri Dec 15 02:54:13 2000
-+++ saferpay/saferpay.mk	Wed Sep 12 07:07:34 2001
-@@ -7,13 +7,13 @@
+--- saferpay/saferpay.mk.orig	Tue Feb 18 16:58:08 2003
++++ saferpay/saferpay.mk	Tue Feb 18 16:58:50 2003
+@@ -7,18 +7,11 @@
  
  ####### Compiler, tools and options
  
+-#CC	=	/project/gcc31/bin/gcc
+-#CXX	=	/project/gcc31/bin/g++
+-
 -CC	=	gcc
 -CXX	=	g++
--CFLAGS	=	-pipe -O2
--CXXFLAGS=	-pipe -O2
-+#CC	=	gcc
-+#CXX	=	g++
-+#CFLAGS	=	-pipe -O2
-+#CXXFLAGS=	-pipe -O2
- INCPATH	=	
+-
+-CFLAGS	=	-pipe -fPIC -O2
+-CXXFLAGS=	-pipe -fPIC -O2
++CFLAGS	+=	-fPIC
++CXXFLAGS +=	-fPIC
++LFLAGS	=	-fPIC -Lout
+ INCPATH	=		
+-#LINK	=	/project/gcc31/bin/g++
 -LINK	=	g++
--LFLAGS	=	
+-LFLAGS	=	-fPIC
 +LINK	=	$(CXX)
-+LFLAGS	=	-Lout
  LIBS	=	-lidpapp
  MOC	=	$(QTDIR)/bin/moc
  
diff --git a/security/saferpay/files/patch-xml-xmlElementEnum.h b/security/saferpay/files/patch-xml-xmlElementEnum.h
deleted file mode 100644
index a135810f03ce..000000000000
--- a/security/saferpay/files/patch-xml-xmlElementEnum.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- saferpay/xml/xmlElementEnum.h.orig	Mon Sep  9 21:43:38 2002
-+++ saferpay/xml/xmlElementEnum.h	Mon Sep  9 21:43:41 2002
-@@ -11,7 +11,7 @@
- 
- class xmlElementEnum : public SxObject
- {
--	friend xmlElement;
-+	friend class xmlElement;
- 
- public:
- 	xmlElementEnum() : SxObject() {;}
diff --git a/security/saferpay/pkg-plist.p5 b/security/saferpay/pkg-plist.p5
index 8a6d19bb7a4e..4943b234db95 100644
--- a/security/saferpay/pkg-plist.p5
+++ b/security/saferpay/pkg-plist.p5
@@ -18,8 +18,8 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObjec
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/MessageObject.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/soplex/saferpay/MessageObject.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/autosplit.ix
-lib/perl5/5.00503/man/man3/soplex::saferpay::MessageFactory.3
-lib/perl5/5.00503/man/man3/soplex::saferpay::MessageObject.3
+lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/../man/man3/soplex::saferpay::MessageFactory.3.gz
+lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/../man/man3/soplex::saferpay::MessageObject.3.gz
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory