aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlev <lev@FreeBSD.org>2004-08-22 02:33:26 +0800
committerlev <lev@FreeBSD.org>2004-08-22 02:33:26 +0800
commitdfffa8c65bf09bdfcc30cfe817bc5214aabe37ef (patch)
tree6220cdbe4ff3628802be2580f7218f465bcb4604
parentd873e27f03c53ddb57a508c7ce8cf9f6394f46f0 (diff)
downloadfreebsd-ports-gnome-dfffa8c65bf09bdfcc30cfe817bc5214aabe37ef.tar.gz
freebsd-ports-gnome-dfffa8c65bf09bdfcc30cfe817bc5214aabe37ef.tar.zst
freebsd-ports-gnome-dfffa8c65bf09bdfcc30cfe817bc5214aabe37ef.zip
Fix stupid errors in Makefile.
Remove `*.la' installation. Remove `*.a' installation for Python module. PR: ports/70694 Submitted by: Yen-Ming Lee <leeym@utopia.leeym.com>
-rw-r--r--devel/subversion-devel/Makefile9
-rw-r--r--devel/subversion-devel/pkg-plist27
-rw-r--r--devel/subversion-freebsd/Makefile9
-rw-r--r--devel/subversion-freebsd/pkg-plist27
-rw-r--r--devel/subversion/Makefile9
-rw-r--r--devel/subversion/pkg-plist27
-rw-r--r--devel/subversion16/Makefile9
-rw-r--r--devel/subversion16/pkg-plist27
8 files changed, 20 insertions, 124 deletions
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index a96fe4f14629..21a0193d805e 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -6,7 +6,7 @@
PORTNAME= subversion
PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/tarballs/
@@ -19,10 +19,10 @@ INSTALLS_SHLIB= yes
USE_SIZE= yes
USE_BZIP2= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL_VER=15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-ssl --with-neon=${LOCALBASE}
+CONFIGURE_ARGS= --with-ssl
MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
MAN5= svnserve.conf.5
@@ -45,7 +45,7 @@ CFLAGS+= -g
.endif
.if !defined(WITHOUT_NEON)
-LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \
+LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon
CONFIGURE_ARGS+= --with-neon=${LOCALBASE}
PLIST_SUB+= WITHOUT_NEON=""
.else
@@ -223,6 +223,7 @@ post-patch:
.endif
@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
pre-configure:
@if [ ! -x ${APR_APU_DIR}/apr-config -o ! -x ${APR_APU_DIR}/apu-config ] ; then \
diff --git a/devel/subversion-devel/pkg-plist b/devel/subversion-devel/pkg-plist
index 555c29542511..0d6bd72699b6 100644
--- a/devel/subversion-devel/pkg-plist
+++ b/devel/subversion-devel/pkg-plist
@@ -41,47 +41,36 @@ include/subversion-1/svn_wc.h
include/subversion-1/svn_xml.h
@dirrm include/subversion-1
lib/libsvn_client-1.a
-lib/libsvn_client-1.la
lib/libsvn_client-1.so
lib/libsvn_client-1.so.0
lib/libsvn_delta-1.a
-lib/libsvn_delta-1.la
lib/libsvn_delta-1.so
lib/libsvn_delta-1.so.0
lib/libsvn_diff-1.a
-lib/libsvn_diff-1.la
lib/libsvn_diff-1.so
lib/libsvn_diff-1.so.0
lib/libsvn_fs-1.a
-lib/libsvn_fs-1.la
lib/libsvn_fs-1.so
lib/libsvn_fs-1.so.0
lib/libsvn_ra-1.a
-lib/libsvn_ra-1.la
lib/libsvn_ra-1.so
lib/libsvn_ra-1.so.0
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.a
-%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.la
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so.0
lib/libsvn_ra_local-1.a
-lib/libsvn_ra_local-1.la
lib/libsvn_ra_local-1.so
lib/libsvn_ra_local-1.so.0
lib/libsvn_ra_svn-1.a
-lib/libsvn_ra_svn-1.la
lib/libsvn_ra_svn-1.so
lib/libsvn_ra_svn-1.so.0
lib/libsvn_repos-1.a
-lib/libsvn_repos-1.la
lib/libsvn_repos-1.so
lib/libsvn_repos-1.so.0
lib/libsvn_subr-1.a
-lib/libsvn_subr-1.la
lib/libsvn_subr-1.so
lib/libsvn_subr-1.so.0
lib/libsvn_wc-1.a
-lib/libsvn_wc-1.la
lib/libsvn_wc-1.so
lib/libsvn_wc-1.so.0
%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
@@ -89,7 +78,6 @@ lib/libsvn_wc-1.so.0
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
%%WITH_PERL%%lib/libsvn_swig_perl-1.a
-%%WITH_PERL%%lib/libsvn_swig_perl-1.la
%%WITH_PERL%%lib/libsvn_swig_perl-1.so
%%WITH_PERL%%lib/libsvn_swig_perl-1.so.0
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm
@@ -125,31 +113,16 @@ lib/libsvn_wc-1.so.0
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN
%%WITH_PYTHON%%lib/libsvn_swig_py-1.a
-%%WITH_PYTHON%%lib/libsvn_swig_py-1.la
%%WITH_PYTHON%%lib/libsvn_swig_py-1.so
%%WITH_PYTHON%%lib/libsvn_swig_py-1.so.0
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.py
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.so
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.py
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.pyc
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index a96fe4f14629..21a0193d805e 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -6,7 +6,7 @@
PORTNAME= subversion
PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/tarballs/
@@ -19,10 +19,10 @@ INSTALLS_SHLIB= yes
USE_SIZE= yes
USE_BZIP2= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL_VER=15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-ssl --with-neon=${LOCALBASE}
+CONFIGURE_ARGS= --with-ssl
MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
MAN5= svnserve.conf.5
@@ -45,7 +45,7 @@ CFLAGS+= -g
.endif
.if !defined(WITHOUT_NEON)
-LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \
+LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon
CONFIGURE_ARGS+= --with-neon=${LOCALBASE}
PLIST_SUB+= WITHOUT_NEON=""
.else
@@ -223,6 +223,7 @@ post-patch:
.endif
@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
pre-configure:
@if [ ! -x ${APR_APU_DIR}/apr-config -o ! -x ${APR_APU_DIR}/apu-config ] ; then \
diff --git a/devel/subversion-freebsd/pkg-plist b/devel/subversion-freebsd/pkg-plist
index 555c29542511..0d6bd72699b6 100644
--- a/devel/subversion-freebsd/pkg-plist
+++ b/devel/subversion-freebsd/pkg-plist
@@ -41,47 +41,36 @@ include/subversion-1/svn_wc.h
include/subversion-1/svn_xml.h
@dirrm include/subversion-1
lib/libsvn_client-1.a
-lib/libsvn_client-1.la
lib/libsvn_client-1.so
lib/libsvn_client-1.so.0
lib/libsvn_delta-1.a
-lib/libsvn_delta-1.la
lib/libsvn_delta-1.so
lib/libsvn_delta-1.so.0
lib/libsvn_diff-1.a
-lib/libsvn_diff-1.la
lib/libsvn_diff-1.so
lib/libsvn_diff-1.so.0
lib/libsvn_fs-1.a
-lib/libsvn_fs-1.la
lib/libsvn_fs-1.so
lib/libsvn_fs-1.so.0
lib/libsvn_ra-1.a
-lib/libsvn_ra-1.la
lib/libsvn_ra-1.so
lib/libsvn_ra-1.so.0
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.a
-%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.la
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so.0
lib/libsvn_ra_local-1.a
-lib/libsvn_ra_local-1.la
lib/libsvn_ra_local-1.so
lib/libsvn_ra_local-1.so.0
lib/libsvn_ra_svn-1.a
-lib/libsvn_ra_svn-1.la
lib/libsvn_ra_svn-1.so
lib/libsvn_ra_svn-1.so.0
lib/libsvn_repos-1.a
-lib/libsvn_repos-1.la
lib/libsvn_repos-1.so
lib/libsvn_repos-1.so.0
lib/libsvn_subr-1.a
-lib/libsvn_subr-1.la
lib/libsvn_subr-1.so
lib/libsvn_subr-1.so.0
lib/libsvn_wc-1.a
-lib/libsvn_wc-1.la
lib/libsvn_wc-1.so
lib/libsvn_wc-1.so.0
%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
@@ -89,7 +78,6 @@ lib/libsvn_wc-1.so.0
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
%%WITH_PERL%%lib/libsvn_swig_perl-1.a
-%%WITH_PERL%%lib/libsvn_swig_perl-1.la
%%WITH_PERL%%lib/libsvn_swig_perl-1.so
%%WITH_PERL%%lib/libsvn_swig_perl-1.so.0
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm
@@ -125,31 +113,16 @@ lib/libsvn_wc-1.so.0
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN
%%WITH_PYTHON%%lib/libsvn_swig_py-1.a
-%%WITH_PYTHON%%lib/libsvn_swig_py-1.la
%%WITH_PYTHON%%lib/libsvn_swig_py-1.so
%%WITH_PYTHON%%lib/libsvn_swig_py-1.so.0
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.py
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.so
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.py
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.pyc
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index a96fe4f14629..21a0193d805e 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -6,7 +6,7 @@
PORTNAME= subversion
PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/tarballs/
@@ -19,10 +19,10 @@ INSTALLS_SHLIB= yes
USE_SIZE= yes
USE_BZIP2= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL_VER=15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-ssl --with-neon=${LOCALBASE}
+CONFIGURE_ARGS= --with-ssl
MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
MAN5= svnserve.conf.5
@@ -45,7 +45,7 @@ CFLAGS+= -g
.endif
.if !defined(WITHOUT_NEON)
-LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \
+LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon
CONFIGURE_ARGS+= --with-neon=${LOCALBASE}
PLIST_SUB+= WITHOUT_NEON=""
.else
@@ -223,6 +223,7 @@ post-patch:
.endif
@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
pre-configure:
@if [ ! -x ${APR_APU_DIR}/apr-config -o ! -x ${APR_APU_DIR}/apu-config ] ; then \
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index 555c29542511..0d6bd72699b6 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -41,47 +41,36 @@ include/subversion-1/svn_wc.h
include/subversion-1/svn_xml.h
@dirrm include/subversion-1
lib/libsvn_client-1.a
-lib/libsvn_client-1.la
lib/libsvn_client-1.so
lib/libsvn_client-1.so.0
lib/libsvn_delta-1.a
-lib/libsvn_delta-1.la
lib/libsvn_delta-1.so
lib/libsvn_delta-1.so.0
lib/libsvn_diff-1.a
-lib/libsvn_diff-1.la
lib/libsvn_diff-1.so
lib/libsvn_diff-1.so.0
lib/libsvn_fs-1.a
-lib/libsvn_fs-1.la
lib/libsvn_fs-1.so
lib/libsvn_fs-1.so.0
lib/libsvn_ra-1.a
-lib/libsvn_ra-1.la
lib/libsvn_ra-1.so
lib/libsvn_ra-1.so.0
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.a
-%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.la
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so.0
lib/libsvn_ra_local-1.a
-lib/libsvn_ra_local-1.la
lib/libsvn_ra_local-1.so
lib/libsvn_ra_local-1.so.0
lib/libsvn_ra_svn-1.a
-lib/libsvn_ra_svn-1.la
lib/libsvn_ra_svn-1.so
lib/libsvn_ra_svn-1.so.0
lib/libsvn_repos-1.a
-lib/libsvn_repos-1.la
lib/libsvn_repos-1.so
lib/libsvn_repos-1.so.0
lib/libsvn_subr-1.a
-lib/libsvn_subr-1.la
lib/libsvn_subr-1.so
lib/libsvn_subr-1.so.0
lib/libsvn_wc-1.a
-lib/libsvn_wc-1.la
lib/libsvn_wc-1.so
lib/libsvn_wc-1.so.0
%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
@@ -89,7 +78,6 @@ lib/libsvn_wc-1.so.0
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
%%WITH_PERL%%lib/libsvn_swig_perl-1.a
-%%WITH_PERL%%lib/libsvn_swig_perl-1.la
%%WITH_PERL%%lib/libsvn_swig_perl-1.so
%%WITH_PERL%%lib/libsvn_swig_perl-1.so.0
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm
@@ -125,31 +113,16 @@ lib/libsvn_wc-1.so.0
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN
%%WITH_PYTHON%%lib/libsvn_swig_py-1.a
-%%WITH_PYTHON%%lib/libsvn_swig_py-1.la
%%WITH_PYTHON%%lib/libsvn_swig_py-1.so
%%WITH_PYTHON%%lib/libsvn_swig_py-1.so.0
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.py
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.so
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.py
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.pyc
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index a96fe4f14629..21a0193d805e 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -6,7 +6,7 @@
PORTNAME= subversion
PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/tarballs/
@@ -19,10 +19,10 @@ INSTALLS_SHLIB= yes
USE_SIZE= yes
USE_BZIP2= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL_VER=15
USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-ssl --with-neon=${LOCALBASE}
+CONFIGURE_ARGS= --with-ssl
MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
MAN5= svnserve.conf.5
@@ -45,7 +45,7 @@ CFLAGS+= -g
.endif
.if !defined(WITHOUT_NEON)
-LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \
+LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon
CONFIGURE_ARGS+= --with-neon=${LOCALBASE}
PLIST_SUB+= WITHOUT_NEON=""
.else
@@ -223,6 +223,7 @@ post-patch:
.endif
@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
pre-configure:
@if [ ! -x ${APR_APU_DIR}/apr-config -o ! -x ${APR_APU_DIR}/apu-config ] ; then \
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index 555c29542511..0d6bd72699b6 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -41,47 +41,36 @@ include/subversion-1/svn_wc.h
include/subversion-1/svn_xml.h
@dirrm include/subversion-1
lib/libsvn_client-1.a
-lib/libsvn_client-1.la
lib/libsvn_client-1.so
lib/libsvn_client-1.so.0
lib/libsvn_delta-1.a
-lib/libsvn_delta-1.la
lib/libsvn_delta-1.so
lib/libsvn_delta-1.so.0
lib/libsvn_diff-1.a
-lib/libsvn_diff-1.la
lib/libsvn_diff-1.so
lib/libsvn_diff-1.so.0
lib/libsvn_fs-1.a
-lib/libsvn_fs-1.la
lib/libsvn_fs-1.so
lib/libsvn_fs-1.so.0
lib/libsvn_ra-1.a
-lib/libsvn_ra-1.la
lib/libsvn_ra-1.so
lib/libsvn_ra-1.so.0
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.a
-%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.la
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so
%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so.0
lib/libsvn_ra_local-1.a
-lib/libsvn_ra_local-1.la
lib/libsvn_ra_local-1.so
lib/libsvn_ra_local-1.so.0
lib/libsvn_ra_svn-1.a
-lib/libsvn_ra_svn-1.la
lib/libsvn_ra_svn-1.so
lib/libsvn_ra_svn-1.so.0
lib/libsvn_repos-1.a
-lib/libsvn_repos-1.la
lib/libsvn_repos-1.so
lib/libsvn_repos-1.so.0
lib/libsvn_subr-1.a
-lib/libsvn_subr-1.la
lib/libsvn_subr-1.so
lib/libsvn_subr-1.so.0
lib/libsvn_wc-1.a
-lib/libsvn_wc-1.la
lib/libsvn_wc-1.so
lib/libsvn_wc-1.so.0
%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
@@ -89,7 +78,6 @@ lib/libsvn_wc-1.so.0
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
%%WITH_PERL%%lib/libsvn_swig_perl-1.a
-%%WITH_PERL%%lib/libsvn_swig_perl-1.la
%%WITH_PERL%%lib/libsvn_swig_perl-1.so
%%WITH_PERL%%lib/libsvn_swig_perl-1.so.0
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm
@@ -125,31 +113,16 @@ lib/libsvn_wc-1.so.0
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN
%%WITH_PYTHON%%lib/libsvn_swig_py-1.a
-%%WITH_PYTHON%%lib/libsvn_swig_py-1.la
%%WITH_PYTHON%%lib/libsvn_swig_py-1.so
%%WITH_PYTHON%%lib/libsvn_swig_py-1.so.0
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.py
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.a
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.la
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.so
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.py
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.pyc