Index: head/math/abacus/Makefile
===================================================================
--- head/math/abacus/Makefile	(revision 384952)
+++ head/math/abacus/Makefile	(revision 384953)
@@ -1,38 +1,42 @@
 # Created by: gahr
 # $FreeBSD$
 
 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}
-
 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}|' \
+		-e 's|%%CXX%%|${CXX}|' \
+		-e 's|%%PERL5%%|${PERL5}|' \
+		-e '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
+	${INSTALL_DATA} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.a \
+		${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.so.1 \
+		${STAGEDIR}${PREFIX}/lib
+	${LN} -sf libabacus-osi.so.1 \
+		${STAGEDIR}${PREFIX}/lib/libabacus-osi.so
+	(cd ${WRKSRC}/Include && ${COPYTREE_SHARE} abacus \
+		${STAGEDIR}${PREFIX}/include)
 
 .include <bsd.port.mk>
Index: head/math/abacus/files/patch-Makefile
===================================================================
--- head/math/abacus/files/patch-Makefile	(revision 384952)
+++ head/math/abacus/files/patch-Makefile	(revision 384953)
@@ -1,74 +1,83 @@
 --- Makefile.orig	2012-01-06 14:29:04.000000000 +0100
 +++ Makefile	2013-09-05 14:35:52.000000000 +0200
 @@ -7,7 +7,7 @@
  #######################################################################
  
  # Path to coin-osi header files 
 -	OSI_INCLUDE=/usr/include/coin
 +	OSI_INCLUDE=%%LOCALBASE%%/include/coin
  # Path to solver include directories - leave empty if the solver 
  # is not installed
       CLP_PATH=$(OSI_INCLUDE)
 @@ -40,7 +40,7 @@
  #######################################################################
  
  # gcc 
 -CCC = g++-4.4
 +CCC = %%CXX%%
  
  # add files to an archive
  ARCHIVE	    = ar rc
 @@ -48,10 +48,10 @@
  # PRE_ARCHIVE is used to instantiate required templates (SGI)
  PRE_ARCHIVE = true
  
 -STRIP       = strip -x
 +STRIP       = true
  
  AWK	    = awk
 -PERL	    = /usr/bin/perl
 +PERL	    = %%PERL5%%
  
  # 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
  
  CCFLAGS = $(ABACUS_INCLUDE) $(CCFLAG_SYS) $(CCFLAG_COMPILER) \
 -	$(CCFLAG_TEMPLATE) $(CCFLAG_PARALLEL) $(CCFLAG_DEBOPT) 
 +	$(CCFLAG_TEMPLATE) $(CCFLAG_PARALLEL) $(CCFLAG_DEBOPT) \
 +	-fPIC
  
  #######################################################################
  #
 @@ -523,15 +524,20 @@
  	$(ARCHIVE) $@ $(OSI_O)
  
  # 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)
 +
  # Build the library distribution directory (lib and lib/stuff)
 -lib-all: subdirs abacus-base lpif interface $(ADDITIONAL_LIB_ALL)
 +lib-all: subdirs abacus-base-static abacus-base-shared lpif interface $(ADDITIONAL_LIB_ALL)
  
  # Create a tar file containing all necessary stuff to compile ABACUS on
  # a remote system.
 @@ -571,6 +577,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
Index: head/math/abacus/pkg-plist
===================================================================
--- head/math/abacus/pkg-plist	(revision 384952)
+++ head/math/abacus/pkg-plist	(revision 384953)
@@ -1,104 +1,104 @@
-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
 include/abacus/array.h
 include/abacus/array.inc
 include/abacus/bheap.h
 include/abacus/bheap.inc
 include/abacus/boundbranchrule.h
 include/abacus/bprioqueue.h
 include/abacus/bprioqueue.inc
 include/abacus/branchrule.h
 include/abacus/bstack.h
 include/abacus/bstack.inc
 include/abacus/buffer.h
 include/abacus/buffer.inc
 include/abacus/column.h
 include/abacus/colvar.h
 include/abacus/conbranchrule.h
 include/abacus/conclass.h
 include/abacus/constraint.h
 include/abacus/convar.h
 include/abacus/cowtimer.h
 include/abacus/cputimer.h
 include/abacus/csense.h
 include/abacus/cutbuffer.h
 include/abacus/cutbuffer.inc
 include/abacus/debug.h
 include/abacus/dictionary.h
 include/abacus/dictionary.inc
 include/abacus/dlist.h
 include/abacus/dlist.inc
 include/abacus/dlistitem.h
 include/abacus/dlistitem.inc
 include/abacus/dualbound.h
 include/abacus/exceptions.h
 include/abacus/fastset.h
 include/abacus/fixcand.h
 include/abacus/fsvarstat.h
 include/abacus/global.h
 include/abacus/hash.h
 include/abacus/hash.inc
 include/abacus/history.h
 include/abacus/id.h
 include/abacus/idmap.h
 include/abacus/idmap.inc
 include/abacus/infeascon.h
 include/abacus/intset.h
 include/abacus/list.h
 include/abacus/list.inc
 include/abacus/listitem.h
 include/abacus/listitem.inc
 include/abacus/lp.h
 include/abacus/lpmaster.h
 include/abacus/lpmasterosi.h
 include/abacus/lpsolution.h
 include/abacus/lpsolution.inc
 include/abacus/lpsub.h
 include/abacus/lpsubosi.h
 include/abacus/lpvarstat.h
 include/abacus/master.h
 include/abacus/message.h
 include/abacus/mtserver.h
 include/abacus/nonduplpool.h
 include/abacus/nonduplpool.inc
 include/abacus/numcon.h
 include/abacus/numvar.h
 include/abacus/opensub.h
 include/abacus/optsense.h
 include/abacus/osiif.h
 include/abacus/osiinclude.h
 include/abacus/ostream.h
 include/abacus/parmaster.h
 include/abacus/pool.h
 include/abacus/pool.inc
 include/abacus/poolslot.h
 include/abacus/poolslot.inc
 include/abacus/poolslotref.h
 include/abacus/poolslotref.inc
 include/abacus/ring.h
 include/abacus/ring.inc
 include/abacus/row.h
 include/abacus/rowcon.h
 include/abacus/separator.h
 include/abacus/separator.inc
 include/abacus/set.h
 include/abacus/setbranchrule.h
 include/abacus/slackstat.h
 include/abacus/sorter.h
 include/abacus/sorter.inc
 include/abacus/sparvec.h
 include/abacus/srowcon.h
 include/abacus/standardpool.h
 include/abacus/standardpool.inc
 include/abacus/string.h
 include/abacus/sub.h
 include/abacus/subserver.h
 include/abacus/tailoff.h
 include/abacus/timer.h
 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