8 files changed, 57 insertions, 36 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 504187ccf6a1..a6767bec6e38 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -369,6 +369,7 @@
     SUBDIR += liblingoteach
     SUBDIR += liblrdf
     SUBDIR += libmrss
+    SUBDIR += libmrss-php
     SUBDIR += libnxml
     SUBDIR += libparsifal
     SUBDIR += libpathan
diff --git a/textproc/libmrss-php/Makefile b/textproc/libmrss-php/Makefile
new file mode 100644
index 000000000000..efc2ebd53753
--- /dev/null
+++ b/textproc/libmrss-php/Makefile
@@ -0,0 +1,31 @@
+# Created by: Rodrigo Osorio <rodrigo@bebik.net>
+# $FreeBSD$
+
+PORTNAME=	libmrss
+PORTVERSION=	0.19.2
+CATEGORIES=	textproc
+MASTER_SITES=	http://www.autistici.org/bakunin/libmrss/
+PKGNAMESUFFIX=	-php
+
+MAINTAINER=	rodrigo@bebik.net
+COMMENT=	PHP library for parsing, writing, and creating RSS
+
+LIB_DEPENDS=	mrss:${PORTSDIR}/textproc/libmrss
+
+GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+USE_LDCONFIG=	yes
+
+USE_PHP=	yes
+USE_PHPIZE=	yes
+USE_PHP_BUILD=	yes
+USE_AUTOTOOLS+=	autoconf:env
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/phpmrss
+
+PLIST_FILES=	lib/php/${PHP_EXT_DIR}/mrss.so
+PLIST_DIRSTRY=	lib/php/${PHP_EXTDIR} \
+		lib/php
+
+.include <bsd.port.mk>
diff --git a/textproc/libmrss-php/distinfo b/textproc/libmrss-php/distinfo
new file mode 100644
index 000000000000..dfa49400401e
--- /dev/null
+++ b/textproc/libmrss-php/distinfo
@@ -0,0 +1,2 @@
+SHA256 (libmrss-0.19.2.tar.gz) = 071416adcae5c1a9317a4a313f2deb34667e3cc2be4487fb3076528ce45b210b
+SIZE (libmrss-0.19.2.tar.gz) = 375238
diff --git a/textproc/libmrss-php/files/patch-phpmrss_php.c b/textproc/libmrss-php/files/patch-phpmrss_php.c
new file mode 100644
index 000000000000..3e434141ed64
--- /dev/null
+++ b/textproc/libmrss-php/files/patch-phpmrss_php.c
@@ -0,0 +1,11 @@
+--- php.c	2008-01-25 19:32:24.000000000 +0100
++++ php.c 	2012-08-20 03:10:45.000000000 +0200
+@@ -58,7 +58,7 @@
+ return SUCCESS;
+ }
+ 
+-static function_entry mrss_functions[] = {
++static zend_function_entry mrss_functions[] = {
+   PHP_FE (mrss_parse_url, NULL) 
+   PHP_FE (mrss_parse_url_with_options, NULL) 
+   PHP_FE (mrss_parse_file, NULL) 
diff --git a/textproc/libmrss-php/pkg-descr b/textproc/libmrss-php/pkg-descr
new file mode 100644
index 000000000000..5ca2b38f2339
--- /dev/null
+++ b/textproc/libmrss-php/pkg-descr
@@ -0,0 +1,4 @@
+PHP bindings for the mRss library for parsing, writing and creating RSS files or
+streams.
+
+WWW:    http://www2.autistici.org/bakunin/libmrss/doc/
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 5ff41eb27853..3253e95f9421 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -1,23 +1,17 @@
-# Ports collection makefile for:	libmrss
-# Date created:			Jan 2, 2007
-# Whom:				Cheng-Lung Sung <clsung@FreeBSD.org>
-#
+# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libmrss
 PORTVERSION=	0.19.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.autistici.org/bakunin/libmrss/
 
 MAINTAINER=	clsung@FreeBSD.org
-COMMENT=	A C library for parsing, writing, and creating RSS
+COMMENT=	C library for parsing, writing, and creating RSS
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
-		nxml.18:${PORTSDIR}/textproc/libnxml
-
-OPTIONS=	PHPMRSS "support to PHP" on
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
+		nxml:${PORTSDIR}/textproc/libnxml
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
@@ -25,24 +19,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	yes
 USE_PKGCONFIG=	yes
-WANT_GNOME=	yes
-
-pre-patch:
-		${gnomehack_PRE_PATCH}
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_PHPMRSS)
-BROKEN=		does not compile
-USE_PHP=	yes
-USE_PHP_BUILD=	yes
-USE_AUTOTOOLS+=	autoconf:env
-post-install:
-		@(cd ${WRKSRC}/phpmrss; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
-		@(cd ${WRKSRC}/phpmrss; ${SETENV} ${SCRIPTS_ENV} CC=${CC} ./configure; ${MAKE} install)
-PLIST_SUB+=	PHPMRSS=""
-.else
-PLIST_SUB+=	PHPMRSS="@comment "
-.endif
+USE_GNOME=	gnomehack
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/libmrss/pkg-descr b/textproc/libmrss/pkg-descr
index f978d699d897..481b581d5e46 100644
--- a/textproc/libmrss/pkg-descr
+++ b/textproc/libmrss/pkg-descr
@@ -1,3 +1,3 @@
 mRss is a C library for parsing, writing and creating RSS files or streams.
 
-WWW:    http://www2.autistici.org/bakunin/libmrss/doc/
+WWW: http://www2.autistici.org/bakunin/libmrss/doc/
diff --git a/textproc/libmrss/pkg-plist b/textproc/libmrss/pkg-plist
index 4e3bd4b7cc83..7bd3e7c044b6 100644
--- a/textproc/libmrss/pkg-plist
+++ b/textproc/libmrss/pkg-plist
@@ -1,10 +1,6 @@
-@comment $FreeBSD$
 include/mrss.h
 lib/libmrss.a
 lib/libmrss.la
 lib/libmrss.so
 lib/libmrss.so.19
 libdata/pkgconfig/mrss.pc
-%%PHPMRSS%%lib/php/%%PHP_EXT_DIR%%/mrss.so
-%%PHPMRSS%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
-%%PHPMRSS%%@dirrmtry lib/php