- Add support for pear modules to have non .tgz extensions.

- Fix a plist generation bug when no files are installed into a directory.

PR:		152059 152055
Submitted by:	Tom Judge <tom@tomjudge.com>
Tested via:	pointyhat

devel/pear/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	pear
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mm

devel/pear/bsd.pear.mk

@@ -6,7 +6,11 @@ MASTER_SITES?=	http://pear.php.net/get/ \
 		http://us.pear.php.net/get/ \
 		http://de.pear.php.net/get/
 PKGNAMEPREFIX=	pear-
+.if defined(PEAR_DIST_SUFX)
+EXTRACT_SUFX=	${PEAR_DIST_SUFX}
+.else
 EXTRACT_SUFX=	.tgz
+.endif
 DIST_SUBDIR=	PEAR
 
 RUN_DEPENDS+=	pear:${PORTSDIR}/devel/pear
@@ -97,7 +101,19 @@ pre-install:
 	@${FALSE}
 .endif
 
-DIRFILTER=	${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' | ${SORT} -ru
+DIRFILTER=	${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' \
+		    | ( while read r; do \
+			C=1; \
+			while [ $$C = 1 ]; do \
+			    echo $$r; \
+			    if echo $$r | ${GREP} '/' > /dev/null; then \
+	                        r=`${DIRNAME} $$r`; \
+			    else  \
+	                        C=0; \
+	                    fi; \
+	                done; \
+	            done \
+	      ) | ${SORT} -ur
 
 .if !defined(USE_PHPIZE)
 do-generate-plist: