Update to 1.1 (git)

4 files changed, 8 insertions, 48 deletions

diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile
index bee26b1e67c0..cad383d5a06c 100644
--- a/graphics/php-facedetect/Makefile
+++ b/graphics/php-facedetect/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	facedetect
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.xarg.org/download/
+MASTER_SITES=	https://github.com/infusion/PHP-Facedetect/tarball/${GITVERSION}/
 PKGNAMEPREFIX=	php-
+DISTNAME=	infusion-PHP-Facedetect-${GITVERSION}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Face detection extension for PHP using OpenCV library
@@ -19,6 +19,9 @@ LIB_DEPENDS=	opencv_legacy.2:${PORTSDIR}/graphics/opencv
 
 LICENSE=	PHP30
 
+GITVERSION=	75a1d8f
+FETCH_ARGS=	-pRr
+
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -26,8 +29,6 @@ USE_PHP=	yes
 USE_PHPIZE=	yes
 USE_PHPEXT=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 CONFIGURE_ARGS+=	--with-facedetect
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/php-facedetect/distinfo b/graphics/php-facedetect/distinfo
index 8c114bf6c872..8521f7c3aae0 100644
--- a/graphics/php-facedetect/distinfo
+++ b/graphics/php-facedetect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (facedetect-1.0.1.tar.gz) = 248f6d265219ae24e3c2f1c8b8e5801bcad4a70d5460a1f1d29cecdd04b7f188
-SIZE (facedetect-1.0.1.tar.gz) = 2791
+SHA256 (infusion-PHP-Facedetect-75a1d8f.tar.gz) = e9deeeeee359adf7eb00a4fe45866908d7f2c8238a8cd7832e5ef3998ec04d01
+SIZE (infusion-PHP-Facedetect-75a1d8f.tar.gz) = 2981
diff --git a/graphics/php-facedetect/files/patch-config.m4 b/graphics/php-facedetect/files/patch-config.m4
deleted file mode 100644
index 9ef19afebcc5..000000000000
--- a/graphics/php-facedetect/files/patch-config.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- config.m4.orig	2011-06-28 15:05:08.566341757 +0200
-+++ config.m4	2011-06-28 15:06:08.526112463 +0200
-@@ -25,15 +25,12 @@
-   PHP_ADD_INCLUDE($FACEDETECT_DIR/include)
- 
-   AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv/cv.h], [], AC_MSG_ERROR('opencv/cv.h' header not found))
--  AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv/cvver.h], [], AC_MSG_ERROR('opencv/cvver.h' header not found))
-+  AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv2/core/version.hpp], [], AC_MSG_ERROR('opencv2/core/version.hpp' header not found))
-   AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv/highgui.h], [], AC_MSG_ERROR('opencv/highgui.h' header not found))
- 
--  PHP_CHECK_LIBRARY(cv, cvLoad,
-+  PHP_CHECK_LIBRARY(opencv_legacy, cvLoad,
-   [
--    PHP_ADD_LIBRARY_WITH_PATH(cv, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD)
--    PHP_ADD_LIBRARY_WITH_PATH(cvaux, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD)
--    PHP_ADD_LIBRARY_WITH_PATH(highgui, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD)
--    PHP_ADD_LIBRARY_WITH_PATH(cxcore, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY_WITH_PATH(opencv_legacy, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD)
-     AC_DEFINE(HAVE_FACEDETECT, 1, [ ])
-   ],[
-     AC_MSG_ERROR([wrong OpenCV version or OpenCV not found])
diff --git a/graphics/php-facedetect/files/patch-facedetect.c b/graphics/php-facedetect/files/patch-facedetect.c
deleted file mode 100644
index fc83012c89db..000000000000
--- a/graphics/php-facedetect/files/patch-facedetect.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- facedetect.c.orig	2010-03-15 01:07:12.000000000 +0100
-+++ facedetect.c	2011-06-28 15:08:27.134914621 +0200
-@@ -21,7 +21,7 @@
- #include "php_facedetect.h"
- 
- #include <opencv/cv.h>
--#include <opencv/cvver.h>
-+#include <opencv2/core/version.hpp>
- #include <opencv/highgui.h>
- 
- /* {{{ facedetect_functions[]
-@@ -104,7 +104,7 @@
- 
- 	storage = cvCreateMemStorage(0);
- 
--	faces = cvHaarDetectObjects(gray, cascade, storage, 1.1, 2, CV_HAAR_DO_CANNY_PRUNING, cvSize(0, 0));
-+	faces = cvHaarDetectObjects(gray, cascade, storage, 1.1, 2, CV_HAAR_DO_CANNY_PRUNING, cvSize(0, 0), cvSize(0, 0));
- 
- 	if(return_type) {
-