svn commit: r384956 - in head/math/abacus: . files

[Jan Beich]

Author: jbeich
Date: Wed Apr 29 03:20:52 2015
New Revision: 384956
URL: https://svnweb.freebsd.org/changeset/ports/384956

Log:
  math/abacus: kill roundabout post-patch target

Modified:
  head/math/abacus/Makefile
  head/math/abacus/files/patch-Makefile

Modified: head/math/abacus/Makefile
==============================================================================
--- head/math/abacus/Makefile	Wed Apr 29 03:20:39 2015	(r384955)
+++ head/math/abacus/Makefile	Wed Apr 29 03:20:52 2015	(r384956)
@@ -20,14 +20,9 @@ USES=		gmake perl5
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 ALL_TARGET=	abacus
-
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		-e 's|%%CXX%%|${CXX}|' \
-		-e 's|%%PERL5%%|${PERL5}|' \
-		-e 's|%%CXXFLAGS%%|${CXXFLAGS}|' \
-		${WRKSRC}/Makefile
+MAKE_ARGS=	CCC="${CXX}" PERL="${PERL5}" STRIP="${STRIP_CMD} -x" \
+		CCFLAG_DEBOPT="${CXXFLAGS}" \
+		OSI_INCLUDE="${LOCALBASE}/include/coin"
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.a \

Modified: head/math/abacus/files/patch-Makefile
==============================================================================
--- head/math/abacus/files/patch-Makefile	Wed Apr 29 03:20:39 2015	(r384955)
+++ head/math/abacus/files/patch-Makefile	Wed Apr 29 03:20:52 2015	(r384956)
@@ -1,45 +1,5 @@
 --- 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).
 @@ -177,6 +177,11 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.cc
  	$(CCC)  $(CCFLAGS) $(ADDFLAGS) -c $< -o $@
  	$(STRIP) $@