Attachment 155281 Details for Bug 199243 – math_abacus.diff

[patch] math_abacus.diff

math_abacus.diff (text/plain), 6.51 KB, created by tkato432 on 2015-04-06 18:53:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-04-06 18:53:35 UTC

Size: 6.51 KB

patch

obsolete

>diff -urN /usr/ports/math/abacus/Makefile math/abacus/Makefile
>--- /usr/ports/math/abacus/Makefile	2015-02-13 18:38:13.996612000 +0900
>+++ math/abacus/Makefile	2015-04-07 00:00:00.000000000 +0900
>@@ -3,36 +3,39 @@
> 
> PORTNAME=	abacus
> DISTVERSION=	3.2betaU1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	math
> MASTER_SITES=	http://www.informatik.uni-koeln.de/abacus/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Branch-And-CUt System
> 
>-LICENSE=	GPLv2
>+LICENSE=	LGPL21 # (or later)
> 
> LIB_DEPENDS=	libClp.so:${PORTSDIR}/math/coinmp
> 
>-USE_GCC=	yes
>+NO_WRKSUBDIR=	yes
>+
> USES=		gmake perl5
> USE_PERL5=	build
>-USE_LDCONFIG=	yes
> ALL_TARGET=	abacus
>-
>-WRKSRC=		${WRKDIR}
>+USE_LDCONFIG=	yes
> 
> post-patch:
>-	${REINPLACE_CMD} -e '\
>-	    s|%%LOCALBASE%%|${LOCALBASE}|g; \
>-	    s|%%CXX%%|${CXX}|g; \
>-	    s|%%PERL5%%|${PERL5}|g' \
>-	    ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e \
>+		's|%%LOCALBASE%%|${LOCALBASE}| ; \
>+		 s|%%CXX%%|${CXX}| ; \
>+		 s|%%PERL5%%|${PERL5}| ; \
>+		 s|%%CXXFLAGS%%|${CXXFLAGS}|' ${WRKSRC}/Makefile
> 
> do-install:
>-	${INSTALL_DATA} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.a ${STAGEDIR}${PREFIX}/lib/libabacus-osi.a
>-	${INSTALL_PROGRAM} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.so ${STAGEDIR}${PREFIX}/lib/libabacus-osi.so.1
>-	${LN} -sf libabacus-osi.so.1 ${STAGEDIR}${PREFIX}/lib/libabacus-osi.so
>-	cd ${WRKSRC}/Include && ${COPYTREE_SHARE} abacus ${STAGEDIR}${PREFIX}/include
>+	@(cd ${WRKSRC}/Include && ${COPYTREE_SHARE} abacus \
>+		${STAGEDIR}${PREFIX}/include)
>+	(cd ${WRKSRC}/lib/linux20-gcc44 && ${INSTALL_DATA} libabacus-osi.a \
>+		${STAGEDIR}${PREFIX}/lib)
>+	(cd ${WRKSRC}/lib/linux20-gcc44 && ${INSTALL_LIB} libabacus-osi.so.1 \
>+		${STAGEDIR}${PREFIX}/lib)
>+	@${LN} -sf libabacus-osi.so.1 \
>+		${STAGEDIR}${PREFIX}/lib/libabacus-osi.so
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/math/abacus/files/patch-Makefile math/abacus/files/patch-Makefile
>--- /usr/ports/math/abacus/files/patch-Makefile	2014-06-21 17:46:53.000000000 +0900
>+++ math/abacus/files/patch-Makefile	2015-04-07 00:00:00.000000000 +0900
>@@ -31,6 +31,15 @@
>  
>  # Gnu cp
>  GCP	    = /bin/cp
>+@@ -59,7 +59,7 @@
>+ CPLEXFLAGS      = -DCPX_PROTOTYPE_ANSI -DPROTOTYPE_MAX
>+ CCFLAG_SYS      = -DABACUS_SYS_LINUX -DABACUS_THROW_WITH_INFO
>+ CCFLAG_COMPILER = -DABACUS_COMPILER_GCC43 -Wall
>+-CCFLAG_DEBOPT   = -O2
>++CCFLAG_DEBOPT   = %%CXXFLAGS%%
>+ CCFLAG_PARALLEL =
>+ 
>+ # default parallel flags (to be defined in machine specific makefile).
> @@ -141,7 +141,8 @@
>  DEPEND = $(OBJDIR)/Makefile.dep
>  
>@@ -47,14 +56,14 @@
>  # The basic ABACUS library
> -abacus-base:	$(LIBDIR)/stuff/abacus-base.a
> +abacus-base-static:	$(LIBDIR)/stuff/abacus-base.a
>-+abacus-base-shared:	$(LIBDIR)/stuff/abacus-base.so
>++abacus-base-shared:	$(LIBDIR)/stuff/abacus-base.so.1
>  
>  $(LIBDIR)/stuff/abacus-base.a: $(ABACUS_O)
>  	rm -f $@
>  	@$(PRE_ARCHIVE) $(ABACUS_O)
>  	$(ARCHIVE) $@ $(ABACUS_O)
>  
>-+$(LIBDIR)/stuff/abacus-base.so: $(ABACUS_O)
>++$(LIBDIR)/stuff/abacus-base.so.1: $(ABACUS_O)
> +	rm -f $@
> +	$(CXX) -shared -o $@ $(ABACUS_O)
> +
>@@ -68,7 +77,7 @@
>  
>  abacus: lib-all
>  	cp $(LIBDIR)/stuff/abacus-base.a $(LIBDIR)/libabacus-osi.a
>-+	cp $(LIBDIR)/stuff/abacus-base.so $(LIBDIR)/libabacus-osi.so
>++	cp $(LIBDIR)/stuff/abacus-base.so.1 $(LIBDIR)/libabacus-osi.so.1
>  	mkdir $(LIBDIR)/temp
>  	cd $(LIBDIR)/temp; ar x ../stuff/interface-osi.a 
>  	find $(LIBDIR)/temp -name \*.o | xargs -n1 ar r $(LIBDIR)/libabacus-osi.a
>diff -urN /usr/ports/math/abacus/pkg-descr math/abacus/pkg-descr
>--- /usr/ports/math/abacus/pkg-descr	2014-06-21 17:46:53.000000000 +0900
>+++ math/abacus/pkg-descr	2015-04-07 00:00:00.000000000 +0900
>@@ -1,24 +1,24 @@
>-ABACUS is a software system written in C++ that provides a framework for the
>-implementation of branch-and-bound algorithms using linear programming
>+ABACUS is a software system written in C++ that provides a framework for
>+the implementation of branch-and-bound algorithms using linear programming
> relaxations. Cutting planes or columns can be generated dynamically
> (branch-and-cut, branch-and-price, branch-and-cut-and-price).
> 
> ABACUS allows the software developer to concentrate merely on the problem
>-specific parts, i.e., the separation of cutting planes, column generation, and
>-primal heuristics. ABACUS supports the Open Solver Interface (Osi) developed
>-by the COIN-OR (COmputational INfrastructure for Operations Research) project
>-which means that every solver supported by OSI can be used to solve the
>-relaxations.
>+specific parts, i.e., the separation of cutting planes, column generation,
>+and primal heuristics. ABACUS supports the Open Solver Interface (Osi)
>+developed by the COIN-OR (COmputational INfrastructure for Operations
>+Research) project which means that every solver supported by OSI can be
>+used to solve the relaxations.
> 
>-Moreover, ABACUS provides a variety of general algorithmic concepts, e.g., a
>-list of different enumeration and branching strategies from which the best
>-alternative for the user's application can be chosen.
>+Moreover, ABACUS provides a variety of general algorithmic concepts, e.g.,
>+a list of different enumeration and branching strategies from which the
>+best alternative for the user's application can be chosen.
> 
>-Finally, ABACUS provides many basic data structures and useful tools for the
>-implementation of such algorithms. It is designed both for general mixed
>-integer optimization problems and for combinatorial optimization problems. It
>-unifies cutting plane and column generation within one algorithm framework.
>-Simple reuse of code and the design of abstract data structures and algorithms
>-are met by object oriented programming modules. 
>+Finally, ABACUS provides many basic data structures and useful tools for
>+the implementation of such algorithms. It is designed both for general
>+mixed integer optimization problems and for combinatorial optimization
>+problems. It unifies cutting plane and column generation within one
>+algorithm framework. Simple reuse of code and the design of abstract data
>+structures and algorithms are met by object oriented programming modules.
> 
> WWW: http://www.informatik.uni-koeln.de/abacus/
>diff -urN /usr/ports/math/abacus/pkg-plist math/abacus/pkg-plist
>--- /usr/ports/math/abacus/pkg-plist	2014-11-14 19:07:18.000000000 +0900
>+++ math/abacus/pkg-plist	2015-04-07 00:00:00.000000000 +0900
>@@ -1,6 +1,3 @@
>-lib/libabacus-osi.a
>-lib/libabacus-osi.so
>-lib/libabacus-osi.so.1
> include/abacus/abacusroot.h
> include/abacus/active.h
> include/abacus/active.inc
>@@ -102,3 +99,6 @@
> include/abacus/valbranchrule.h
> include/abacus/variable.h
> include/abacus/vartype.h
>+lib/libabacus-osi.a
>+lib/libabacus-osi.so
>+lib/libabacus-osi.so.1

Actions: View | Diff

Attachments on bug 199243: 155281