From owner-svn-ports-all@freebsd.org Tue Mar 13 16:19:23 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4967FF2D271; Tue, 13 Mar 2018 16:19:23 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F340585D5F; Tue, 13 Mar 2018 16:19:22 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EE4401C13D; Tue, 13 Mar 2018 16:19:22 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2DGJMqn000353; Tue, 13 Mar 2018 16:19:22 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DGJMDt000351; Tue, 13 Mar 2018 16:19:22 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <201803131619.w2DGJMDt000351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Tue, 13 Mar 2018 16:19:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464388 - in head/math/abacus: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gahr X-SVN-Commit-Paths: in head/math/abacus: . files X-SVN-Commit-Revision: 464388 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 16:19:23 -0000 Author: gahr Date: Tue Mar 13 16:19:22 2018 New Revision: 464388 URL: https://svnweb.freebsd.org/changeset/ports/464388 Log: math/abacus: unbreak, undeprecate, bump PR: 199772 Modified: head/math/abacus/Makefile head/math/abacus/files/patch-Makefile Modified: head/math/abacus/Makefile ============================================================================== --- head/math/abacus/Makefile Tue Mar 13 15:06:22 2018 (r464387) +++ head/math/abacus/Makefile Tue Mar 13 16:19:22 2018 (r464388) @@ -3,7 +3,7 @@ PORTNAME= abacus DISTVERSION= 3.2betaU1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= math MASTER_SITES= http://www.informatik.uni-koeln.de/abacus/ @@ -12,9 +12,6 @@ COMMENT= Branch-And-CUt System LICENSE= LGPL21+ -DEPRECATED= Unmaintained and has a broken shared library -EXPIRATION_DATE= 2018-03-31 - LIB_DEPENDS= libClp.so:math/coinmp NO_WRKSUBDIR= yes @@ -23,6 +20,7 @@ USES= gmake perl5 USE_PERL5= build USE_LDCONFIG= yes ALL_TARGET= abacus +CXXFLAGS+= -fPIC MAKE_ARGS= CCC="${CXX}" PERL="${PERL}" STRIP="${STRIP_CMD} -x" \ ARCHIVE="${AR} ${ARFLAGS}" CCFLAG_DEBOPT="${CXXFLAGS}" \ OSI_INCLUDE="${LOCALBASE}/include/coin" Modified: head/math/abacus/files/patch-Makefile ============================================================================== --- head/math/abacus/files/patch-Makefile Tue Mar 13 15:06:22 2018 (r464387) +++ head/math/abacus/files/patch-Makefile Tue Mar 13 16:19:22 2018 (r464388) @@ -1,5 +1,5 @@ ---- Makefile.orig 2012-01-06 14:29:04.000000000 +0100 -+++ Makefile 2013-09-05 14:35:52.000000000 +0200 +--- Makefile.orig 2012-01-06 13:29:04 UTC ++++ Makefile @@ -177,6 +177,11 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.cc $(CCC) $(CCFLAGS) $(ADDFLAGS) -c $< -o $@ $(STRIP) $@ @@ -12,7 +12,7 @@ ####################################################################### # -@@ -523,15 +524,20 @@ +@@ -523,15 +528,22 @@ $(LIBDIR)/stuff/interface-osi.a: $(OSI_O $(ARCHIVE) $@ $(OSI_O) # The basic ABACUS library @@ -27,7 +27,9 @@ +$(LIBDIR)/stuff/abacus-base.so.1: $(ABACUS_O:%.o=%.So) + rm -f $@ -+ $(CCC) $(LDFLAGS) -shared -o $@ $(ABACUS_O:%.o=%.So) ++ $(CCC) $(LDFLAGS) -shared -o $@ $(ABACUS_O:%.o=%.So) \ ++ `find $(LIBDIR)/temp -name \*.o | xargs -n1` \ ++ `find $(LIBDIR)/stuff -name \*.o | xargs -n1` \ + # Build the library distribution directory (lib and lib/stuff) -lib-all: subdirs abacus-base lpif interface $(ADDITIONAL_LIB_ALL) @@ -35,7 +37,7 @@ # Create a tar file containing all necessary stuff to compile ABACUS on # a remote system. -@@ -571,6 +577,7 @@ +@@ -571,6 +583,7 @@ have_lib = $(wildcard $(LIBDIR)/libabacu abacus: lib-all cp $(LIBDIR)/stuff/abacus-base.a $(LIBDIR)/libabacus-osi.a