Maintainer update to version 1.2.1

PR:		ports/45188
Submitted by:	Alex Dupre <sysadmin@alexdupre.com>

6 files changed, 19 insertions, 35 deletions

diff --git a/www/php-screw/Makefile b/www/php-screw/Makefile
index 87f4d6573e39..64481ebb74af 100644
--- a/www/php-screw/Makefile
+++ b/www/php-screw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	php-screw
-PORTVERSION=	1.1
+PORTVERSION=	1.2.1
 CATEGORIES=	www security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,8 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-CRYPTKEY?=	abcdefg
-PATTERN?=	PAT1
+CRYPTKEY?=	11152, 368, 192, 1281, 62
 
 USE_LIBTOOL=	yes
 
@@ -35,9 +34,8 @@ pre-everything:
 	@${ECHO} ""
 	@${ECHO} "To achieve real security, define your own encryption"
 	@${ECHO} "seed key (CRYPTKEY); longer is better."
-	@${ECHO} "Optionally customize the file pattern (PATTERN)."
 	@${ECHO} ""
-	@${ECHO} "make CRYPTKEY=MyLongKey PATTERN=MYPAT"
+	@${ECHO} "make CRYPTKEY=\"234, 84, 39664, 771, 9853\""
 	@${ECHO} ""
 
 post-extract:
@@ -45,15 +43,13 @@ post-extract:
 	@(cd ${WRKSRC}; ${LOCALBASE}/bin/phpize)
 
 post-patch:
-	@${ECHO} "#define PM9SCREW_MYCRYPTKEY_1   \"${CRYPTKEY}\"" > \
-		${WRKSRC}/extension/my_screw.h
-	@${ECHO} "#define PM9SCREW_MYPATTERN_1   \"${PATTERN}\"" >> \
-		${WRKSRC}/extension/my_screw.h
+	@${ECHO} "short pm9screw_mycryptkey[] = { ${CRYPTKEY} };" > \
+		${WRKSRC}/my_screw.h
 
 do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-	@(cd ${BUILD_WRKSRC}/extension; ${SETENV} ${MAKE_ENV} ${MAKE} \
+	@(cd ${BUILD_WRKSRC}/tools; ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 post-build:
@@ -63,9 +59,7 @@ do-install:
 	@${MKDIR} ${PREFIX}/lib/php/extensions
 	@${INSTALL_DATA} ${WRKSRC}/modules/php_screw.so \
 		${PREFIX}/lib/php/extensions
-	@${INSTALL_DATA} ${WRKSRC}/extension/php_screw_ext.so \
-		${PREFIX}/lib/php/extensions
-	@${INSTALL_PROGRAM} ${WRKSRC}/extension/screw ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/tools/screw ${PREFIX}/bin
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/php-screw/distinfo b/www/php-screw/distinfo
index 0393168270f4..93eb940facab 100644
--- a/www/php-screw/distinfo
+++ b/www/php-screw/distinfo
@@ -1 +1 @@
-MD5 (php_screw-1.1.tgz) = 60ac37dead8278c15db84d3054d19f4d
+MD5 (php_screw-1.2.1.tgz) = f53c28e0450bd1435f343c901a14f9fe
diff --git a/www/php-screw/files/patch-extension::Makefile b/www/php-screw/files/patch-extension::Makefile
deleted file mode 100644
index 7481ce45c53a..000000000000
--- a/www/php-screw/files/patch-extension::Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-$FreeBSD$
-
---- extension/Makefile.orig	Wed May 22 12:36:27 2002
-+++ extension/Makefile	Wed May 22 12:36:51 2002
-@@ -1,11 +1,11 @@
- all: php_screw_ext.so screw
- 
- php_screw_ext.so: php_screw_ext.c zencode.c
--	gcc -fPIC -c php_screw_ext.c zencode.c
--	gcc -shared -Wl -o php_screw_ext.so php_screw_ext.o zencode.o -lz
-+	${CC} -fPIC -c php_screw_ext.c zencode.c
-+	${CC} -shared -Wl -o php_screw_ext.so php_screw_ext.o zencode.o -lz
- 
- screw: screw.c zencode.c
--	gcc -o screw screw.c zencode.c -lz
-+	${CC} -o screw screw.c zencode.c -lz
- 
- clean:
- 	/bin/rm *.o *.so screw
diff --git a/www/php-screw/files/patch-tools::Makefile b/www/php-screw/files/patch-tools::Makefile
new file mode 100644
index 000000000000..cc3dd8308b3f
--- /dev/null
+++ b/www/php-screw/files/patch-tools::Makefile
@@ -0,0 +1,11 @@
+--- tools/Makefile.orig	Sat Nov  9 15:08:17 2002
++++ tools/Makefile	Sat Nov  9 15:08:33 2002
+@@ -1,7 +1,7 @@
+ all: screw
+ 
+ screw: screw.c zencode.c
+-	gcc -o screw screw.c zencode.c -lz
++	${CC} -o screw screw.c zencode.c -lz
+ 
+ clean:
+ 	/bin/rm *.o *.so screw
diff --git a/www/php-screw/pkg-message b/www/php-screw/pkg-message
index eea24c5797e1..5c24091dc1cf 100644
--- a/www/php-screw/pkg-message
+++ b/www/php-screw/pkg-message
@@ -5,6 +5,5 @@ You have installed the php-screw package.
 Edit %%LOCALBASE%%/etc/php.ini and add:
 
 zend_extension="%%PREFIX%%/lib/php/extensions/php_screw.so"
-zend_extension="%%PREFIX%%/lib/php/extensions/php_screw_ext.so"
 
 *****************************************************************************
diff --git a/www/php-screw/pkg-plist b/www/php-screw/pkg-plist
index ce8cf072aebf..f73a5d39f22d 100644
--- a/www/php-screw/pkg-plist
+++ b/www/php-screw/pkg-plist
@@ -1,3 +1,2 @@
 bin/screw
 lib/php/extensions/php_screw.so
-lib/php/extensions/php_screw_ext.so