Date: Fri, 20 Aug 2004 16:45:11 +0800 (CST) From: Yen-Ming Lee <leeym@utopia.leeym.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lev@FreeBSD.org Subject: ports/70694: [PATCH] devel/subversion: correct Makefile Message-ID: <20040820084511.CB6A03EAC51@utopia.leeym.com> Resent-Message-ID: <200408200850.i7K8oVcg058803@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70694
>Category: ports
>Synopsis: [PATCH] devel/subversion: correct Makefile
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 20 08:50:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #167: Tue Jul 27 05:17:58 CST 2004
>Description:
- correct some errors about NEON
- remove USE_SIZE
- re-order USE_PYTHON and ".include <bsd.port.pre.mk>"
- apply USE_LIBTOOL_VER=15 to eliminate *.la
- remove *.la from pkg-plist
Port maintainer (lev@freebsd.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- subversion-1.0.6_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/subversion/Makefile,v
retrieving revision 1.67
diff -u -u -r1.67 Makefile
--- Makefile 19 Aug 2004 20:40:29 -0000 1.67
+++ Makefile 20 Aug 2004 08:35:43 -0000
@@ -17,12 +17,11 @@
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
@@ -34,6 +33,14 @@
PORTDOCS= ${TXT_DOCS}
.endif
+.if defined(WITH_PYTHON)
+USE_PYTHON= yes
+SWIG_BINDINGS+= python
+PLIST_SUB+= WITH_PYTHON=""
+.else
+PLIST_SUB+= WITH_PYTHON="@comment "
+.endif
+
.include <bsd.port.pre.mk>
SVNREPOS?= /home/svn/repos
@@ -45,7 +52,7 @@
.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
@@ -72,15 +79,6 @@
PLIST_SUB+= WITH_PERL="@comment "
.endif
-.if defined(WITH_PYTHON)
-USE_PYTHON= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-SWIG_BINDINGS+= python
-PLIST_SUB+= WITH_PYTHON=""
-.else
-PLIST_SUB+= WITH_PYTHON="@comment "
-.endif
-
.if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != ""
BUILD_DEPENDS+= swig1.3:${PORTSDIR}/devel/swig13
DEPENDS_ARGS+= SWIG_LANGUAGES='${SWIG_BINDINGS}'
@@ -223,6 +221,7 @@
.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 \
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/subversion/pkg-plist,v
retrieving revision 1.22
diff -u -u -r1.22 pkg-plist
--- pkg-plist 19 Aug 2004 20:40:29 -0000 1.22
+++ pkg-plist 20 Aug 2004 08:35:44 -0000
@@ -41,47 +41,36 @@
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 @@
%%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,7 +113,6 @@
%%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
--- subversion-1.0.6_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040820084511.CB6A03EAC51>