ports/180121: devel/subversion-static fails to link libm and to include serf

[Trond Endrestøl]

>Number:         180121
>Category:       ports
>Synopsis:       devel/subversion-static fails to link libm and to include serf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 30 10:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Trond Endrestøl
>Release:        10.0-CURRENT 20130608 snapshot
>Organization:
Private
>Environment:
FreeBSD freebsd-i386-subversion-static-180.bsd.net 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Sat Jun  8 23:48:52 UTC 2013     root at snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
devel/subversion-static fails to link libm resulting in isnan() being undefined. This could very well be a problem with devel/apr1.

devel/subversion-static fails to include serf.
neon is replaced by serf but devel/subversion-static/Makefile doesn't reflect this change in the list of slave options.
>How-To-Repeat:
Install devel/subversion-static from scratch.
>Fix:
Apply these two patches.
The first one is for devel/subversion-static/work/subversion-1.8.0/Makefile.
The second is for devel/subversion-static/Makefile.

--- Makefile.orig       2013-06-30 11:26:00.000000000 +0200
+++ Makefile    2013-06-30 11:32:11.000000000 +0200
@@ -23,41 +23,41 @@

 top_builddir = .
 top_srcdir = .
 abs_builddir = /usr/ports/workdirs/usr/ports/devel/subversion-static/work/subversion-1.8.0
 abs_srcdir = /usr/ports/workdirs/usr/ports/devel/subversion-static/work/subversion-1.8.0
 VPATH = .

 SVN_RA_LIB_DEPS = $(RA_LOCAL_DEPS) $(RA_SVN_DEPS)
 SVN_RA_LIB_INSTALL_DEPS = install-ramod-lib
 SVN_RA_LIB_LINK = $(RA_LOCAL_LINK) $(RA_SVN_LINK)

 SVN_FS_LIB_DEPS = $(FS_FS_DEPS)
 SVN_FS_LIB_INSTALL_DEPS = install-fsmod-lib
 SVN_FS_LIB_LINK = $(FS_FS_LINK)

 SWIG_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig
 SWIG_BUILD_DIR = $(abs_builddir)/subversion/bindings/swig

 SCHEMA_DIR = subversion/svn/schema

-SVN_APR_LIBS = -L/usr/local/lib -lapr-1 -lcrypt -pthread
+SVN_APR_LIBS = -L/usr/local/lib -lapr-1 -lcrypt -pthread -lm
 SVN_APRUTIL_LIBS = -L/usr/local/lib -laprutil-1 -ldb-4.2 -lgdbm -lexpat -liconv
 SVN_APR_MEMCACHE_LIBS =
 SVN_DB_LIBS =
 SVN_GPG_AGENT_LIBS = @SVN_GPG_AGENT_LIBS@
 SVN_GNOME_KEYRING_LIBS =
 SVN_KWALLET_LIBS =
 SVN_MAGIC_LIBS = -lmagic
 SVN_SASL_LIBS =
 SVN_SERF_LIBS =
 SVN_SQLITE_LIBS = -L/usr/local/lib -lsqlite3
 SVN_XML_LIBS = -lexpat
 SVN_ZLIB_LIBS = -lz

 LIBS = -lintl

 prefix = /usr/local
 exec_prefix = ${prefix}
 libdir = ${exec_prefix}/lib
 fsmod_libdir = ${exec_prefix}/lib
 ramod_libdir = ${exec_prefix}/lib



--- Makefile.orig       2013-05-12 13:28:46.000000000 +0200
+++ Makefile    2013-06-30 11:39:24.000000000 +0200
@@ -1,14 +1,14 @@
 # $FreeBSD: head/devel/subversion-static/Makefile 317310 2013-05-04 12:21:19Z crees $

 PKGNAMESUFFIX= -static

 CONFLICTS_INSTALL=     ${PORTNAME}-[0-9]*
 LATEST_LINK=   ${PORTNAME}${PKGNAMESUFFIX}

 OPTIONS_EXCLUDE=       ${OPTIONS_DEFINE}
-OPTIONS_SLAVE= NEON STATIC FREEBSD_TEMPLATE ENHANCED_KEYWORD
+OPTIONS_SLAVE= SERF STATIC FREEBSD_TEMPLATE ENHANCED_KEYWORD

 MASTERDIR=     ${.CURDIR}/../subversion
 PKGMESSAGE=    ${.CURDIR}/pkg-message

 .include "${MASTERDIR}/Makefile"


>Release-Note:
>Audit-Trail:
>Unformatted: