Attachment #68863 for bug #101109

View | Details | Raw Unified | Return to bug 101109
Collapse All | Expand All

Lines 6-12 Link Here

(-)/usr/home/chinsan/project/pecl-svn/Makefile (-1 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= svn	8	PORTNAME= svn
9	PORTVERSION= 0.1	9	PORTVERSION= 0.2
10	CATEGORIES= devel pear	10	CATEGORIES= devel pear
11	MASTER_SITES= http://pecl.php.net/get/	11	MASTER_SITES= http://pecl.php.net/get/
12	PKGNAMEPREFIX= pecl-	12	PKGNAMEPREFIX= pecl-
Lines 27-31 Link Here
27	.if ${OSVERSION} < 500000	27	.if ${OSVERSION} < 500000
28	BROKEN= Does not compile on FreeBSD 4.x	28	BROKEN= Does not compile on FreeBSD 4.x
29	.endif	29	.endif
		30
		31	post-patch:
		32	@${REINPLACE_CMD} -e 's,apr-0,apr-1,' ${WRKSRC}/config.m4
30		33
31	.include <bsd.port.post.mk>	34	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/usr/home/chinsan/project/pecl-svn/distinfo (-3 / +3 lines)
1	MD5 (PECL/svn-0.1.tgz) = c5b4e16a224ffeafae0bc4cc71f08e63	1	MD5 (PECL/svn-0.2.tgz) = f4370301e025a784d502d69d6a98ec25
2	SHA256 (PECL/svn-0.1.tgz) = fb4f9b56cdd31f679921f94bdc9a63976d4695108a1150ceb53ab06402460547	2	SHA256 (PECL/svn-0.2.tgz) = d23e09666edfde6c54d8b5231940ac2a2553c9833603795614578535610194ac
3	SIZE (PECL/svn-0.1.tgz) = 14801	3	SIZE (PECL/svn-0.2.tgz) = 16843




--- config.m4	Sat Jan  7 19:58:52 2006
+++ config.m4.new	Sat Jan  7 20:00:55 2006
@@ -36,10 +36,10 @@
         if test -d $i/lib64 ; then
           PHP_SVN_LDFLAGS="-L$i/lib64 $PHP_SVN_LDFLAGS"
         fi
-        PHP_SVN_LDFLAGS="$PHP_SVN_LDFLAGS -lsvn_client-1 -lapr-0"
+        PHP_SVN_LDFLAGS="$PHP_SVN_LDFLAGS -lsvn_client-1 -lapr-1"
       fi
-      if test -r $i/include/apr-0/apr.h ; then
-        PHP_SVN_INCLUDES="$PHP_SVN_INCLUDES -I$i/include/apr-0"
+      if test -r $i/include/apr-1/apr.h ; then
+        PHP_SVN_INCLUDES="$PHP_SVN_INCLUDES -I$i/include/apr-1"
       elif test -r $i/include/apache2/apr.h ; then
         PHP_SVN_INCLUDES="$PHP_SVN_INCLUDES -I$i/include/apache2"
       fi

Return to bug 101109

Lines 1-16 Link Here

(-)/usr/home/chinsan/project/pecl-svn/files/patch-config.m4 (-16 lines)
1	--- config.m4 Sat Jan 7 19:58:52 2006
2	+++ config.m4.new Sat Jan 7 20:00:55 2006
3	@@ -36,10 +36,10 @@
4	if test -d $i/lib64 ; then
5	PHP_SVN_LDFLAGS="-L$i/lib64 $PHP_SVN_LDFLAGS"
6	fi
7	- PHP_SVN_LDFLAGS="$PHP_SVN_LDFLAGS -lsvn_client-1 -lapr-0"
8	+ PHP_SVN_LDFLAGS="$PHP_SVN_LDFLAGS -lsvn_client-1 -lapr-1"
9	fi
10	- if test -r $i/include/apr-0/apr.h ; then
11	- PHP_SVN_INCLUDES="$PHP_SVN_INCLUDES -I$i/include/apr-0"
12	+ if test -r $i/include/apr-1/apr.h ; then
13	+ PHP_SVN_INCLUDES="$PHP_SVN_INCLUDES -I$i/include/apr-1"
14	elif test -r $i/include/apache2/apr.h ; then
15	PHP_SVN_INCLUDES="$PHP_SVN_INCLUDES -I$i/include/apache2"
16	fi