Removing dupe from static lib as well.

PR:		152771
Submitted by:	Eijiro Shibusawa <phd_kimberlite@yahoo.co.jp>

3 files changed, 34 insertions, 46 deletions

diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 70c39e1fcf0..5e11d92ac36 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.netlib.org/lapack/ \
 		http://scicomp.ewha.ac.kr/netlib/lapack/ \
 		http://service-spi.web.cern.ch/service-spi/external/tarFiles/
 DISTFILES=	lapack-${PORTVERSION}.tgz manpages-3.2.0.tgz
+DIST_SUBDIR=	lapack
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	A library of Fortran 77 subroutines for linear algebra
@@ -21,7 +22,6 @@ COMMENT=	A library of Fortran 77 subroutines for linear algebra
 LIB_DEPENDS=	blas.2:${PORTSDIR}/math/blas
 
 USE_FORTRAN=	yes
-DIST_SUBDIR=	lapack
 USE_LDCONFIG=	yes
 
 OPTIONS=	PROFILE "Build and install profiling libraries" Off
@@ -77,7 +77,6 @@ post-patch:
 			  -e 's;%%BLAS%%;${BLAS};g' \
 				${WRKSRC}/make.inc
 	@${CP} -r ${WRKSRC} ${WRKSRC_SHARED}
-	@(cd ${WRKSRC_SHARED}; ${PATCH} <${FILESDIR}/shared-patch-SRC+Makefile)
 .if !(defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE))
 	@${CP} -r ${WRKSRC} ${WRKSRC_PROFILE}
 .endif
diff --git a/math/lapack/files/patch-SRC+Makefile b/math/lapack/files/patch-SRC+Makefile
index a8f76e8e17c..019d63c23ff 100644
--- a/math/lapack/files/patch-SRC+Makefile
+++ b/math/lapack/files/patch-SRC+Makefile
@@ -1,6 +1,33 @@
---- SRC/Makefile.org	2009-04-13 15:49:29.000000000 +0900
-+++ SRC/Makefile	2009-04-13 15:49:36.000000000 +0900
-@@ -359,9 +359,9 @@
+--- SRC/Makefile.orig	2010-11-04 11:11:45.000000000 +0900
++++ SRC/Makefile	2010-12-11 12:46:22.000000000 +0900
+@@ -123,7 +123,7 @@
+    sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
+    spbstf.o spbsv.o  spbsvx.o \
+    spbtf2.o spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o  \
+-   sposvx.o spotf2.o spotrf.o spotri.o  spstrf.o spstf2.o \
++   sposvx.o spotf2.o spotri.o spstrf.o spstf2.o \
+    sppcon.o sppequ.o \
+    spprfs.o sppsv.o  sppsvx.o spptrf.o spptri.o spptrs.o sptcon.o \
+    spteqr.o sptrfs.o sptsv.o  sptsvx.o spttrs.o sptts2.o srscl.o  \
+@@ -164,7 +164,7 @@
+    cgels.o  cgelsd.o cgelss.o cgelsx.o cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o \
+    cgeqpf.o cgeqr2.o cgeqr2p.o cgeqrf.o cgeqrfp.o cgerfs.o \
+    cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesv.o  cgesvd.o  \
+-   cgesvx.o cgetc2.o cgetf2.o cgetrf.o cgetri.o cgetrs.o \
++   cgesvx.o cgetc2.o cgetf2.o cgetri.o \
+    cggbak.o cggbal.o cgges.o  cggesx.o cggev.o  cggevx.o cggglm.o \
+    cgghrd.o cgglse.o cggqrf.o cggrqf.o \
+    cggsvd.o cggsvp.o \
+@@ -194,7 +194,7 @@
+    claswp.o clasyf.o clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrz.o \
+    clatzm.o clauu2.o clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o  \
+    cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \
+-   cposv.o  cposvx.o cpotf2.o cpotrf.o cpotri.o cpotrs.o cpstrf.o cpstf2.o \
++   cposv.o  cposvx.o cpotf2.o cpotri.o cpstrf.o cpstf2.o \
+    cppcon.o cppequ.o cpprfs.o cppsv.o  cppsvx.o cpptrf.o cpptri.o cpptrs.o \
+    cptcon.o cpteqr.o cptrfs.o cptsv.o  cptsvx.o cpttrf.o cpttrs.o cptts2.o \
+    crot.o   cspcon.o cspmv.o  cspr.o   csprfs.o cspsv.o  \
+@@ -371,9 +371,9 @@
  
  all: ../$(LAPACKLIB)
  
@@ -10,9 +37,9 @@
 -endif
 +.endif
  
- ALLOBJ=$(SLASRC) $(DLASRC) $(CLASRC) $(ZLASRC) $(SCLAUX) $(DZLAUX)	\
- 	$(ALLAUX)
-@@ -397,13 +397,13 @@
+ ALLOBJ=$(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \
+ 	   $(SCLAUX) $(DZLAUX) $(ALLAUX)
+@@ -409,13 +409,13 @@
  $(CLASRC): $(FRC)
  $(DLASRC): $(FRC)
  $(ZLASRC): $(FRC)
diff --git a/math/lapack/files/shared-patch-SRC+Makefile b/math/lapack/files/shared-patch-SRC+Makefile
deleted file mode 100644
index 1ad95e4e802..00000000000
--- a/math/lapack/files/shared-patch-SRC+Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
---- SRC/Makefile.org	2009-04-13 15:49:29.000000000 +0900
-+++ SRC/Makefile	2009-04-13 15:49:36.000000000 +0900
-@@ -98,7 +98,7 @@
-    sgels.o  sgelsd.o sgelss.o sgelsx.o sgelsy.o sgeql2.o sgeqlf.o \
-    sgeqp3.o sgeqpf.o sgeqr2.o sgeqr2p.o sgeqrf.o sgeqrfp.o sgerfs.o \
-    sgerq2.o sgerqf.o sgesc2.o sgesdd.o sgesv.o  sgesvd.o sgesvx.o \
--   sgetc2.o sgetf2.o sgetri.o \
-+   sgetc2.o sgetf2.o sgetrf.o sgetri.o sgetrs.o \
-    sggbak.o sggbal.o sgges.o  sggesx.o sggev.o  sggevx.o \
-    sggglm.o sgghrd.o sgglse.o sggqrf.o \
-    sggrqf.o sggsvd.o sggsvp.o sgtcon.o sgtrfs.o sgtsv.o  \
-@@ -123,7 +123,7 @@
-    sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
-    spbstf.o spbsv.o  spbsvx.o \
-    spbtf2.o spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o  \
--   sposvx.o spotf2.o spotrf.o spotri.o  spstrf.o spstf2.o \
-+   sposvx.o spotf2.o spotrf.o spotri.o spotrs.o spstrf.o spstf2.o \
-    sppcon.o sppequ.o \
-    spprfs.o sppsv.o  sppsvx.o spptrf.o spptri.o spptrs.o sptcon.o \
-    spteqr.o sptrfs.o sptsv.o  sptsvx.o spttrs.o sptts2.o srscl.o  \
-@@ -146,7 +146,7 @@
-    sgeequb.o ssyequb.o spoequb.o sgbequb.o \
-    sbbcsd.o slapmr.o sorbdb.o sorcsd.o
- 
--DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o 
-+DSLASRC = #spotrs.o sgetrs.o spotrf.o sgetrf.o
- 
- SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o		\
-    sla_gercond.o sla_rpvgrw.o ssysvxx.o ssyrfsx.o			\
-@@ -227,7 +227,7 @@
-    cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o \
-    cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
- 
--ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o 
-+ZCLASRC = #cpotrs.o cgetrs.o cpotrf.o cgetrf.o 
- 
- DLASRC = \
-    dgbbrd.o dgbcon.o dgbequ.o dgbrfs.o dgbsv.o  \