stsp@ and I have been looking at the subversion port recently.
At present a PSEUDO_FLAVOR controls whether the -main subpackage
is built with -pthread (as it's required for gnome-keyring).
This isn't correct as PSEUDO_FLAVORs are only meant to control
what gets built, not change options for a particular produced
subpackage, that's the job of a true FLAVOR instead.
At present -pthread *is* added by default, causing a problem
because pthread forces standard i/o to be non-blocking. Piping the
output of svn to programs expecting standard stdio semantics
doesn't work correctly. (Those who have used "svn diff | less"
on OpenBSD probably know what I mean).
The diff (slightly changed from the last one I sent Stefan) below
- addresses this problem by making gnome-keyring a true
FLAVOR and adding a bit to the already-existing comment in
the Makefile explaining why. People using gnome-keyring
will have to update that manually.
- rolls in the various subpackage PFRAG.shared to PLISTs
since unless those subpackages are disabled, SHARED_ONLY is
set.
- @comments some not-needed plist entries (where subpackages
are used, make plist doesn't handle dirs provided by dependencies
particularly well).
- cleans up WANTLIB
- adds a comment noting autoconf should be 2.63
Question:
Should we bump shared libs for this change (i.e. main files no longer
being built -pthread)? My gut instinct says to bump major, but I'm not
exactly sure why, so I've left it out from this diff.
Of course any other comments (or OKs) about the other parts of the
diff would be welcome.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile 25 Aug 2009 10:26:20 -0000 1.62
+++ Makefile 9 Sep 2009 08:56:26 -0000
@@ -5,17 +5,14 @@ COMMENT-perl= perl interface to subvers
COMMENT-python= python interface to subversion
COMMENT-ruby= ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
-COMMENT-gnome-keyring= gnome-keyring support for subversion
VERSION= 1.6.5
DISTNAME= subversion-${VERSION}
-PKGNAME= ${DISTNAME}
-PKGNAME-main= ${DISTNAME}
-PKGNAME-perl= p5-SVN-${VERSION}
-PKGNAME-python= py-subversion-${VERSION}
-PKGNAME-ruby= ruby-subversion-${VERSION}
-PKGNAME-ap2= ap2-subversion-${VERSION}
-PKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION}
+PKGNAME-main= ${DISTNAME}p0
+FULLPKGNAME-perl= p5-SVN-${VERSION}p0
+FULLPKGNAME-python= py-subversion-${VERSION}p0
+FULLPKGNAME-ruby= ruby-subversion-${VERSION}p0
+FULLPKGNAME-ap2= ap2-subversion-${VERSION}p0
SO_VERSION= 1.2
SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
@@ -40,12 +37,13 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/downloads/
EXTRACT_SUFX= .tar.bz2
-PSEUDO_FLAVORS= no_bindings no_ap2 no_gnome-keyring
+PSEUDO_FLAVORS= no_bindings no_ap2
+FLAVORS= gnome_keyring
FLAVOR?=
MODULES= devel/gettext lang/python
-WANTLIB= expat db z sqlite3
+WANTLIB= expat db z
LIB_DEPENDS= neon.>=26:neon->=0.26.2:net/neon \
apr-1::devel/apr \
@@ -55,8 +53,7 @@ LIB_DEPENDS= neon.>=26:neon->=0.26.2:net
MULTI_PACKAGES= -main
-WANTLIB-main= ${WANTLIB} c crypto iconv intl ssl \
- asn1 gssapi krb5
+WANTLIB-main= ${WANTLIB} asn1 c crypto gssapi krb5 ssl
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS}
CONTRIB_HOOK_SCRIPTS= case-insensitive.py pre-commit-check.py \
@@ -83,7 +80,7 @@ TOOLS_CLIENT_SIDE_SCRIPTS= bash_completi
.if !${FLAVOR:L:Mno_ap2}
MULTI_PACKAGES+= -ap2
-WANTLIB-ap2= ${WANTLIB} apr-1 aprutil-1 expat
+WANTLIB-ap2= ${WANTLIB} apr-1 aprutil-1 sqlite3
LIB_DEPENDS-ap2= ${MODGETTEXT_LIB_DEPENDS}
. for _lib in svn_delta-1 svn_fs-1 svn_fs_base-1 svn_fs_fs-1 \
svn_fs_util-1 svn_repos-1 svn_subr-1
@@ -97,7 +94,7 @@ RUN_DEPENDS-ap2= ::www/apache-httpd
MULTI_PACKAGES+=-perl -python -ruby
SHARED_ONLY= Yes
-WANTLIB-perl= ${WANTLIB} apr-1 aprutil-1
+WANTLIB-perl= ${WANTLIB} apr-1 aprutil-1 sqlite3
RUN_DEPENDS-perl= ${MODGETTEXT_RUN_DEPENDS}
LIB_DEPENDS-perl= ${MODGETTEXT_LIB_DEPENDS}
. for _lib in svn_diff-1 svn_ra-1 svn_delta-1 svn_subr-1 svn_fs-1 \
@@ -105,16 +102,16 @@ LIB_DEPENDS-perl= ${MODGETTEXT_LIB_DEPEN
LIB_DEPENDS-perl+=
${_lib}.>=${SO_VERSION}:${PKGNAME}:devel/subversion,-main
. endfor
-WANTLIB-python= ${WANTLIB} apr-1 aprutil-1 crypto neon sasl2 ssl \
- asn1 gssapi krb5
+WANTLIB-python= ${WANTLIB} apr-1 aprutil-1 asn1 crypto gssapi \
+ krb5 neon sasl2 sqlite3 ssl
RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
LIB_DEPENDS-python= ${MODPY_LIB_DEPENDS} ${MODGETTEXT_LIB_DEPENDS}
. for _lib in ${SVN_LIBS}
LIB_DEPENDS-python+=
${_lib}.>=${SO_VERSION}:${PKGNAME}:devel/subversion,-main
. endfor
-WANTLIB-ruby= ${WANTLIB} apr-1 aprutil-1 crypto neon sasl2 ssl \
- asn1 gssapi krb5
+WANTLIB-ruby= ${WANTLIB} apr-1 aprutil-1 asn1 crypto gssapi \
+ krb5 neon sasl2 sqlite3 ssl
RUN_DEPENDS-ruby= ${MODRUBY_RUN_DEPENDS}
LIB_DEPENDS-ruby= ${MODRUBY_LIB_DEPENDS} \
${MODGETTEXT_LIB_DEPENDS}
@@ -126,25 +123,28 @@ MODULES+= lang/ruby
BUILD_DEPENDS+= :swig->=1.3.36:devel/swig
.endif
-.if !${FLAVOR:L:Mno_gnome-keyring}
-MULTI_PACKAGES+= -gnome-keyring
+.if ${FLAVOR:L:Mgnome_keyring}
SHARED_ONLY= Yes
-LIB_DEPENDS-gnome-keyring= dbus-1.>=7::x11/dbus \
- glib-2.0::devel/glib2 \
- gnome-keyring.>=4::x11/gnome/keyring \
- pcre.>=2::devel/pcre \
- ${MODGETTEXT_LIB_DEPENDS} \
-
svn_subr-1.>=${SO_VERSION}:${PKGNAME}:devel/subversion,-main
-WANTLIB-gnome-keyring= ${WANTLIB} apr-1 aprutil-1 iconv
+LIB_DEPENDS-main+= ${LIB_DEPENDS} \
+ dbus-1.>=7::x11/dbus \
+ glib-2.0::devel/glib2 \
+ gnome-keyring.>=4::x11/gnome/keyring \
+ pcre.>=2::devel/pcre \
+ ${MODGETTEXT_LIB_DEPENDS}
+zWANTLIB-main+= apr-1 aprutil-1 iconv
SHARED_LIBS+= svn_auth_gnome_keyring-1 ${SO_VERSION}
# gnome-keyring depends on dbus depends on pthread, so svn won't be able
-# to load libsvn_auth_gnome_keyring without this:
+# to load libsvn_auth_gnome_keyring without the main executable being compiled
+# and linked with -pthread. We want to avoid this as it causes problems with
+# our current threading implementation (which has to force stdin/stdout to
+# be non-blocking). As this affects -main it must be a FLAVOR.
WANTLIB-main+= pthread
CFLAGS+= -pthread
.endif
MAKE_FLAGS= MAKE=${MAKE_PROGRAM}
USE_LIBTOOL= Yes
+# should be 2.63
AUTOCONF_VERSION=2.62
CONFIGURE_STYLE=autoconf
CONFIGURE_ENV= PYTHON2=${MODPY_BIN}
@@ -178,9 +178,8 @@ pre-configure:
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh
-.if !${FLAVOR:L:Mno_gnome-keyring}
+.if ${FLAVOR:L:Mgnome_keyring}
CONFIGURE_ARGS+=--with-gnome-keyring
-REGRESS_DEPENDS+=:${PKGNAME-gnome-keyring}:devel/subversion,-gnome-keyring
.endif
.if !${FLAVOR:L:Mno_bindings}
Index: pkg/DESCR-gnome-keyring
===================================================================
RCS file: pkg/DESCR-gnome-keyring
diff -N pkg/DESCR-gnome-keyring
--- pkg/DESCR-gnome-keyring 28 Apr 2009 23:43:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-This package adds support for GNOME Keyring to Subversion,
-so that passwords can be stored on disk encrypted.
Index: pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/DESCR-main,v
retrieving revision 1.4
diff -u -p -r1.4 DESCR-main
--- pkg/DESCR-main 25 Aug 2009 10:26:20 -0000 1.4
+++ pkg/DESCR-main 9 Sep 2009 08:56:26 -0000
@@ -13,7 +13,8 @@ the appropriate functionality:
-python Python bindings to Subversion
-ruby Ruby bindings to Subversion
-ap2 Apache httpd 2 modules for Subversion
- -gnome-keyring Support for the gnome-keyring password store
+Flavors:
+ gnome_keyring: Compile with support for gnome-keyring
Also note that plaintext-password caching is disabled by default
by setting "store-plaintext-passwords" to "no" in
${SYSCONFDIR}/subversion/servers.
Index: pkg/PFRAG.gnome_keyring-main
===================================================================
RCS file: pkg/PFRAG.gnome_keyring-main
diff -N pkg/PFRAG.gnome_keyring-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.gnome_keyring-main 9 Sep 2009 08:56:26 -0000
@@ -0,0 +1,6 @@
+...@comment $OpenBSD: PLIST-gnome-keyring,v 1.1 2009/04/28 23:43:57 stsp Exp $
+...@conflict subversion-gnome-keyring-*
+...@pkgpath devel/subversion,-gnome-keyring
+...@comment lib/libsvn_auth_gnome_keyring-1.a
+...@comment lib/libsvn_auth_gnome_keyring-1.la
+...@lib
lib/libsvn_auth_gnome_keyring-1.so.${LIBsvn_auth_gnome_keyring-1_VERSION}
Index: pkg/PFRAG.shared-gnome-keyring
===================================================================
RCS file: pkg/PFRAG.shared-gnome-keyring
diff -N pkg/PFRAG.shared-gnome-keyring
--- pkg/PFRAG.shared-gnome-keyring 28 Apr 2009 23:43:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-...@comment $OpenBSD: PFRAG.shared-gnome-keyring,v 1.1 2009/04/28 23:43:57
stsp Exp $
-...@lib
lib/libsvn_auth_gnome_keyring-1.so.${LIBsvn_auth_gnome_keyring-1_VERSION}
Index: pkg/PFRAG.shared-perl
===================================================================
RCS file: pkg/PFRAG.shared-perl
diff -N pkg/PFRAG.shared-perl
--- pkg/PFRAG.shared-perl 7 Jan 2006 01:10:11 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-...@comment $OpenBSD: PFRAG.shared-perl,v 1.2 2006/01/07 01:10:11 steven Exp $
-...@lib lib/libsvn_swig_perl-1.so.${LIBsvn_swig_perl-1_VERSION}
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/_Client.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Core/_Core.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Delta/_Delta.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Fs/_Fs.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Ra/_Ra.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Repos/_Repos.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Wc/_Wc.so
Index: pkg/PFRAG.shared-python
===================================================================
RCS file: pkg/PFRAG.shared-python
diff -N pkg/PFRAG.shared-python
--- pkg/PFRAG.shared-python 2 Nov 2008 20:43:49 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-...@comment $OpenBSD: PFRAG.shared-python,v 1.4 2008/11/02 20:43:49 steven Exp
$
-...@lib lib/libsvn_swig_py-1.so.${LIBsvn_swig_py-1_VERSION}
-lib/python${MODPY_VERSION}/site-packages/libsvn/_client.so
-lib/python${MODPY_VERSION}/site-packages/libsvn/_core.so
-lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.so
-lib/python${MODPY_VERSION}/site-packages/libsvn/_diff.so
-lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.so
-lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.so
-lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.so
-lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.so
Index: pkg/PFRAG.shared-ruby
===================================================================
RCS file: pkg/PFRAG.shared-ruby
diff -N pkg/PFRAG.shared-ruby
--- pkg/PFRAG.shared-ruby 2 Nov 2008 20:43:49 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-...@comment $OpenBSD: PFRAG.shared-ruby,v 1.2 2008/11/02 20:43:49 steven Exp $
-...@lib lib/libsvn_swig_ruby-1.so.${LIBsvn_swig_ruby-1_VERSION}
-lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.so
-lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/core.so
-lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/delta.so
-lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/diff.so
-lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/fs.so
-lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/ra.so
-lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/repos.so
-lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.so
Index: pkg/PLIST-ap2
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-ap2,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-ap2
--- pkg/PLIST-ap2 28 Apr 2009 23:43:57 -0000 1.3
+++ pkg/PLIST-ap2 9 Sep 2009 08:56:26 -0000
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST-ap2,v 1.3 2009/04/28 23:43:57 stsp Exp $
include/subversion-1/mod_authz_svn.h
include/subversion-1/mod_dav_svn.h
-lib/apache2/
lib/apache2/mod_authz_svn.so
lib/apache2/mod_dav_svn.so
Index: pkg/PLIST-gnome-keyring
===================================================================
RCS file: pkg/PLIST-gnome-keyring
diff -N pkg/PLIST-gnome-keyring
--- pkg/PLIST-gnome-keyring 28 Apr 2009 23:43:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-...@comment $OpenBSD: PLIST-gnome-keyring,v 1.1 2009/04/28 23:43:57 stsp Exp $
-%%SHARED%%
-lib/libsvn_auth_gnome_keyring-1.a
-lib/libsvn_auth_gnome_keyring-1.la
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 25 Aug 2009 10:26:20 -0000 1.6
+++ pkg/PLIST-main 9 Sep 2009 08:56:26 -0000
@@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.6 2009/08/25 10:26:20 stsp Exp $
+...@conflict subversion-gnome-keyring-*
@pkgpath devel/subversion,no_bindings
@pkgpath devel/subversion
%%SHARED%%
+%%gnome_keyring%%
@comment @bin bin/diff
@comment @bin bin/diff3
@comment @bin bin/diff4
@@ -57,6 +59,7 @@ include/subversion-1/svn_utf.h
include/subversion-1/svn_version.h
include/subversion-1/svn_wc.h
include/subversion-1/svn_xml.h
+...@comment lib/apache2/
lib/libsvn_client-1.a
lib/libsvn_client-1.la
lib/libsvn_delta-1.a
@@ -85,6 +88,12 @@ lib/libsvn_subr-1.a
lib/libsvn_subr-1.la
lib/libsvn_wc-1.a
lib/libsvn_wc-1.la
+...@comment lib/python${MODPY_VERSION}/
+...@comment lib/python${MODPY_VERSION}/site-packages/
+...@comment lib/ruby/
+...@comment lib/ruby/site_ruby/
+...@comment lib/ruby/site_ruby/${MODRUBY_REV}/
+...@comment lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/
@man man/man1/svn.1
@man man/man1/svnadmin.1
@man man/man1/svndumpfilter.1
@@ -136,8 +145,6 @@ share/examples/subversion/client-side/sv
share/examples/subversion/client-side/svn2cl/svn2html.xsl
share/examples/subversion/client-side/svn_apply_autoprops.py
share/examples/subversion/client-side/svn_export_empty_files.py
-share/examples/subversion/servers
-...@sample ${SYSCONFDIR}/subversion/servers
share/examples/subversion/dumpprops.py
share/examples/subversion/get-location-segments.py
share/examples/subversion/getfile.py
@@ -190,6 +197,8 @@ share/examples/subversion/server-side/sv
share/examples/subversion/server-side/svn-fast-backup
share/examples/subversion/server-side/svn-populate-node-origins-index.c
share/examples/subversion/server-side/svn-tweak-author.py
+share/examples/subversion/servers
+...@sample ${SYSCONFDIR}/subversion/servers
share/examples/subversion/svnlog2html.rb
share/examples/subversion/svnlook.py
share/examples/subversion/svnlook.rb
Index: pkg/PLIST-perl
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-perl,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-perl
--- pkg/PLIST-perl 28 Apr 2009 23:43:57 -0000 1.5
+++ pkg/PLIST-perl 9 Sep 2009 08:56:26 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST-perl,v 1.5 2009/04/28 23:43:57 stsp Exp $
-%%SHARED%%
lib/libsvn_swig_perl-1.a
lib/libsvn_swig_perl-1.la
+...@lib lib/libsvn_swig_perl-1.so.${LIBsvn_swig_perl-1_VERSION}
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Base.pm
@@ -16,18 +16,25 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/_Client.bs
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/_Client.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Core/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Core/_Core.bs
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Core/_Core.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Delta/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Delta/_Delta.bs
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Delta/_Delta.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Fs/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Fs/_Fs.bs
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Fs/_Fs.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Ra/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Ra/_Ra.bs
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Ra/_Ra.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Repos/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Repos/_Repos.bs
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Repos/_Repos.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Wc/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Wc/_Wc.bs
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Wc/_Wc.so
@man man/man3p/SVN::Base.3p
@man man/man3p/SVN::Client.3p
@man man/man3p/SVN::Core.3p
Index: pkg/PLIST-python
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-python,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-python
--- pkg/PLIST-python 28 Apr 2009 23:43:57 -0000 1.6
+++ pkg/PLIST-python 9 Sep 2009 08:56:26 -0000
@@ -1,28 +1,34 @@
@comment $OpenBSD: PLIST-python,v 1.6 2009/04/28 23:43:57 stsp Exp $
-%%SHARED%%
lib/libsvn_swig_py-1.a
lib/libsvn_swig_py-1.la
-lib/python${MODPY_VERSION}/
-lib/python${MODPY_VERSION}/site-packages/
+...@lib lib/libsvn_swig_py-1.so.${LIBsvn_swig_py-1_VERSION}
lib/python${MODPY_VERSION}/site-packages/libsvn/
lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.py
lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/_client.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_client.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_client.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_core.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_core.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_core.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_diff.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_diff.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_diff.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.so
lib/python${MODPY_VERSION}/site-packages/libsvn/client.py
lib/python${MODPY_VERSION}/site-packages/libsvn/client.pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/core.py
Index: pkg/PLIST-ruby
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-ruby,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-ruby
--- pkg/PLIST-ruby 28 Apr 2009 23:43:57 -0000 1.5
+++ pkg/PLIST-ruby 9 Sep 2009 08:56:26 -0000
@@ -1,39 +1,43 @@
@comment $OpenBSD: PLIST-ruby,v 1.5 2009/04/28 23:43:57 stsp Exp $
-%%SHARED%%
lib/libsvn_swig_ruby-1.a
lib/libsvn_swig_ruby-1.la
-lib/ruby/
-lib/ruby/site_ruby/
-lib/ruby/site_ruby/${MODRUBY_REV}/
-lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/
+...@lib lib/libsvn_swig_ruby-1.so.${LIBsvn_swig_ruby-1_VERSION}
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/client.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/commit-mailer.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/core.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/delta.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/error.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/fs.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/info.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/ra.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/repos.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/synchronizer.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/util.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/wc.rb
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.la
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.so
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/core.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/core.la
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/core.so
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/delta.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/delta.la
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/delta.so
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/diff.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/diff.la
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/diff.so
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/fs.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/fs.la
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/fs.so
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/ra.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/ra.la
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/ra.so
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/repos.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/repos.la
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/repos.so
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.la
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/client.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/commit-mailer.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/core.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/delta.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/error.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/fs.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/info.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/ra.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/repos.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/synchronizer.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/util.rb
-lib/ruby/site_ruby/${MODRUBY_REV}/svn/wc.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.so
