3 files changed, 43 insertions, 14 deletions

diff --git a/security/lasso/Makefile b/security/lasso/Makefile
index 6eaab3f56b36..587e0e59411e 100644
--- a/security/lasso/Makefile
+++ b/security/lasso/Makefile
@@ -7,22 +7,22 @@
 
 PORTNAME=	lasso
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/520/
 
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Free Liberty Alliance Implementation
 
-LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 RUN_DEPENDS=	xmlsec1:${PORTSDIR}/security/xmlsec1
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 CONFIGURE_ARGS+=	--disable-java --disable-php4 --with-zlib
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack glib20
+USE_GNOME=	gnomehack glib20 libxml2
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-USE_PYTHON=	yes
+USE_PYTHON_BUILD=	yes
 
 .ifdef(WITH_PERL)
 CONFIGURE_ARGS+=	--enable-perl
@@ -33,21 +33,24 @@ CONFIGURE_ARGS+=	--disable-perl
 PLIST_SUB+=	WITH_PERL="@comment "
 .endif
 
-#.ifdef(WITH_PHP5)
-#CONFIGURE_ARGS+=	--enable-php5 \
-#		--with-php5-config="${LOCALBASE}/bin/php-config" \
-#		--with-php5-extension-dir="${PREFIX}/lib/php/${PHP_EXT_DIR}"
-#IGNORE_WITH_PHP=	4
-#PLIST_SUB+=	WITH_PHP5=""
-#USE_PHP=	yes
-#.else
+.ifdef(WITH_PHP5)
+CONFIGURE_ARGS+=	--enable-php5 \
+		--with-php5-config="${LOCALBASE}/bin/php-config"
+IGNORE_WITH_PHP=	4
+LDFLAGS+=	"-L${LOCALBASE}/lib"
+LIB_DEPENDS+=	expat:${PORTSDIR}/textproc/expat2
+PLIST_SUB+=	WITH_PHP5=""
+USE_PHP=	yes
+USE_PHP_BUILD=	yes
+.else
 CONFIGURE_ARGS+=	--disable-php5
 PLIST_SUB+=	WITH_PHP5="@comment "
-#.endif
+.endif
 
 .ifdef(WITH_PYTHON)
 CONFIGURE_ARGS+=	--enable-python
 PLIST_SUB+=	WITH_PYTHON=""
+USE_PYTHON=	yes
 .else
 CONFIGURE_ARGS+=	--disable-python
 PLIST_SUB+=	WITH_PYTHON="@comment "
diff --git a/security/lasso/files/patch-configure b/security/lasso/files/patch-configure
index 183308e4dcc8..ac5924b36a38 100644
--- a/security/lasso/files/patch-configure
+++ b/security/lasso/files/patch-configure
@@ -1,5 +1,25 @@
---- configure.orig	Mon Jul 16 17:17:17 2007
-+++ configure	Mon Jul 16 17:18:09 2007
+--- configure.orig	2007-08-03 10:03:45.000000000 +0800
++++ configure	2007-08-03 10:08:48.000000000 +0800
+@@ -21215,8 +21215,8 @@
+   PHP4_INCLUDES=`$PHP4_CONFIG --includes`
+   PHP4_LDFLAGS=`$PHP4_CONFIG --ldflags`
+   PHP4_LIBS=`$PHP4_CONFIG --libs`
+-  PHP4_UNPREFIXED_EXTENSION_DIR=`$PHP4_CONFIG --extension-dir | $SED 's/\/usr//g'`
+   PHP4_PREFIX=`$PHP4_CONFIG --prefix`
++  PHP4_UNPREFIXED_EXTENSION_DIR=`$PHP4_CONFIG --extension-dir | $SED "s,^$PHP4_PREFIX,,g"`
+ else
+   # We assume PHP are in /usr/local directory.
+   if test $MINGW -eq 1; then
+@@ -21446,8 +21446,8 @@
+   PHP5_INCLUDES=`$PHP5_CONFIG --includes`
+   PHP5_LDFLAGS=`$PHP5_CONFIG --ldflags`
+   PHP5_LIBS=`$PHP5_CONFIG --libs`
+-  PHP5_UNPREFIXED_EXTENSION_DIR=`$PHP5_CONFIG --extension-dir | $SED 's/\/usr//g'`
+   PHP5_PREFIX=`$PHP5_CONFIG --prefix`
++  PHP5_UNPREFIXED_EXTENSION_DIR=`$PHP5_CONFIG --extension-dir | $SED "s,^$PHP5_PREFIX,,g"`
+ else
+   # We assume PHP are in /usr/local directory.
+   if test $MINGW -eq 1; then
 @@ -22477,12 +22477,12 @@
          pkg_cv_LASSO_CFLAGS="$LASSO_CFLAGS"
      else
diff --git a/security/lasso/pkg-plist b/security/lasso/pkg-plist
index c7bee4327594..617d79ffe9d8 100644
--- a/security/lasso/pkg-plist
+++ b/security/lasso/pkg-plist
@@ -17,6 +17,9 @@
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/lasso/lasso.bs
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/lasso/lasso.so
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/lasso.pm
+%%WITH_PHP5%%lib/php/%%PHP_EXT_DIR%%/lasso.a
+%%WITH_PHP5%%lib/php/%%PHP_EXT_DIR%%/lasso.la
+%%WITH_PHP5%%lib/php/%%PHP_EXT_DIR%%/lasso.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_lasso.a
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_lasso.la
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_lasso.so
@@ -154,5 +157,8 @@ libdata/pkgconfig/lasso.pc
 @dirrmtry include/lasso/id-ff
 @dirrmtry include/lasso
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/lasso
+%%WITH_PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
+%%WITH_PHP5%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
+%%WITH_PHP5%%@dirrmtry lib/php
 %%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/lasso
 %%PORTDOCS%%@dirrm %%DOCSDIR%%