On Thu, Aug 16, 2012 at 03:42:38PM +0100, Stuart Henderson wrote:
> On 2012/08/16 16:07, Stefan Sperling wrote:
> > Also include some mostly no-op changes from 'make update-plist'.
>
> I would revert those (with the possible exception of putting info.rb
> in the right alphabetical order), some of them are harmless but
> unnecessary but the PLIST-python ones are wrong (MODPY_PY_PREFIX
> is something of a problem in general with update-plist..)
Fair enough, I've tossed those.
New diff, applies to -current and also fixes WANTLIB for pthread. ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.113
diff -u -p -r1.113 Makefile
--- Makefile 23 Aug 2012 13:52:39 -0000 1.113
+++ Makefile 1 Sep 2012 11:51:54 -0000
@@ -7,13 +7,9 @@ COMMENT-ruby= ruby interface to subvers
COMMENT-ap2= apache2 subversion modules
COMMENT-gnome-keyring= GNOME keyring support for subversion
-VERSION= 1.7.5
+VERSION= 1.7.6
DISTNAME= subversion-${VERSION}
PKGNAME-main= ${DISTNAME}
-REVISION-main= 0
-REVISION-perl= 1
-REVISION-python= 0
-REVISION-ruby= 0
FULLPKGNAME-perl= p5-SVN-${VERSION}
FULLPKGPATH-perl= devel/subversion,-perl
FULLPKGNAME-python= py-subversion-${VERSION}
@@ -60,7 +56,7 @@ FLAVOR += no_perl no_python no_ruby
MODULES= devel/gettext lang/python
-WANTLIB= expat magic z
+WANTLIB= expat magic pthread z
# autogen.sh checks for libtoolize
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
@@ -77,7 +73,7 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
devel/libmagic
WANTLIB-main= ${WANTLIB} asn1 c crypto db gssapi krb5 ssl \
- neon>=26 pthread apr-1 aprutil-1 sasl2>=2 sqlite3 \
+ neon>=26 apr-1 aprutil-1 sasl2>=2 sqlite3 \
m proxy stdc++
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS}
@@ -102,7 +98,7 @@ NOT_FOR_ARCHS-perl = ${NO_SHARED_ARCHS}
NOT_FOR_ARCHS-python = ${NO_SHARED_ARCHS}
NOT_FOR_ARCHS-ruby = ${NO_SHARED_ARCHS}
-WANTLIB-perl= ${WANTLIB} apr-1 aprutil-1 c sqlite3 pthread
+WANTLIB-perl= ${WANTLIB} apr-1 aprutil-1 sqlite3
RUN_DEPENDS-perl= ${MODGETTEXT_RUN_DEPENDS}
LIB_DEPENDS-perl= ${MODGETTEXT_LIB_DEPENDS} ${MAINSPEC}
.for _lib in svn_diff-1 svn_ra-1 svn_delta-1 svn_subr-1 svn_fs-1 \
@@ -138,7 +134,6 @@ LIB_DEPENDS-gnome-keyring= ${MAINSPEC} \
RUN_DEPENDS-gnome-keyring= ${MODGETTEXT_RUN_DEPENDS}
-CFLAGS+= -pthread
MAKE_FLAGS= MAKE=${MAKE_PROGRAM}
USE_LIBTOOL= Yes
AUTOCONF_VERSION=2.64
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo 30 May 2012 12:16:14 -0000 1.34
+++ distinfo 1 Sep 2012 10:02:38 -0000
@@ -1,5 +1,2 @@
-MD5 (subversion-1.7.5.tar.bz2) = 9jU7m1gQgc35cpkwDJ6tow==
-RMD160 (subversion-1.7.5.tar.bz2) = 4WaChpMRBW13cBbzX2Prz/Jy7Jo=
-SHA1 (subversion-1.7.5.tar.bz2) = BcB5diaQ1awczSVJdC5+9w+kXPE=
-SHA256 (subversion-1.7.5.tar.bz2) =
yyPM0IsMHwxm/c2ncyZeQE2V83hJO6ZLSduq9UrkSuw=
-SIZE (subversion-1.7.5.tar.bz2) = 6002955
+SHA256 (subversion-1.7.6.tar.bz2) =
0aTxPFyZKhUnoq6sJixvVOBzljzh0Tq/q7KpCYD6fQU=
+SIZE (subversion-1.7.6.tar.bz2) = 6006767
