Index: head/math/atlas/Makefile
===================================================================
--- head/math/atlas/Makefile	(revision 104268)
+++ head/math/atlas/Makefile	(revision 104269)
@@ -1,178 +1,177 @@
 # New ports collection makefile for:	atlas
 # Date created:		12 February 2001
 # Whom:			Nakata Maho <maho@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 # NOTE: This port purposely ignores the CC and CFLAGS settings.
 #       Program and compiler flags are finetuned to gcc.
 
 PORTNAME=	atlas
 PORTVERSION=	3.6.0
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	math-atlas
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=        Automatically Tuned Linear Algebra Software (ATLAS)
 
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/ATLAS
 INSTALLS_SHLIB= yes
 USE_REINPLACE=  yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 501000 && ${MACHINE_ARCH} == "alpha"
 USE_GCC=3.3
 .endif
 
 # only affects for lapack sub project
 .if defined(WITH_OPTIMIZED_FLAGS)
 FFLAGS+= -pipe -O3 -ffast-math -finline-functions -fstrength-reduce -funroll-loops -fexpensive-optimizations
 .if (${MACHINE_ARCH} == "i386" && !${MACHINE_ARCH} == "amd64" )
 FFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double
 .endif # i386
 .endif
 
 post-patch:
 .if !defined(WITH_OPTIMIZED_FLAGS)
 	@${ECHO_CMD} "You can optimize lapack sub project by setting WITH_OPTIMIZED_FLAGS=yes."
 .endif
-	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+ ${PTHREAD_CFLAGS}+' \
+	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' \
+			  -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g' \
 		${WRKSRC}/config.c
-	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+ ${PTHREAD_LIBS}+' \
-		${WRKSRC}/config.c
 .if (${MACHINE_ARCH} == "alpha")
 	@(cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/alpha-patch)
 .endif
 
 .if !defined(PICFLAG)
 .if ${MACHINE_ARCH} == "sparc64"
 PICFLAG=-fPIC
 .else
 PICFLAG=-fpic
 .endif
 .endif
 
 ANSWER_i386?=	${PRINTF} "\n\n\n\n\n\n\n\n\n\n"
 ANSWER_ia64?=	${PRINTF} "\n\n\n2\n\n\n\n\nf77\n-O2 -static\n\n"
 
 .if !defined(ANSWER_${ARCH})
 ANSWER=	${ANSWER_i386}
 .else
 ANSWER=	${ANSWER_${ARCH}}
 .endif
 
 do-configure:
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} xconfig && \
-		${ANSWER} | ./xconfig -N 1 -c ${CC} -f ${FC} -a NON_THREADED && \
-		${ANSWER} | ./xconfig -N 1 -c ${CC} -f ${FC} -a NON_THREADED_PIC \
+		${ANSWER} | ./xconfig -N 1 -c ${CC} -f ${FC} -m ${CC} -g ${CC} -x ${CC} -a NON_THREADED && \
+		${ANSWER} | ./xconfig -N 1 -c ${CC} -f ${FC} -m ${CC} -g ${CC} -x ${CC} -a NON_THREADED_PIC \
 			-F c '${PICFLAG} -DPIC' -F f '${PICFLAG} -DPIC' \
 			-F m '${PICFLAG} -DPIC' -F x '${PICFLAG} -DPIC')
 	@(cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/thread-patch && \
 		${MAKE_ENV} ${MAKE} xconfig && \
-		${ANSWER} | ./xconfig -c ${CC} -f ${FC} -a THREADED && \
-		${ANSWER} | ./xconfig -c ${CC} -f ${FC} -a THREADED_PIC \
+		${ANSWER} | ./xconfig -c ${CC} -f ${FC} -m ${CC} -g ${CC} -x ${CC} -a THREADED && \
+		${ANSWER} | ./xconfig -c ${CC} -f ${FC} -m ${CC} -g ${CC} -x ${CC} -a THREADED_PIC \
 			-F c '${PICFLAG} -DPIC' -F f '${PICFLAG} -DPIC' \
 			-F m '${PICFLAG} -DPIC' -F x '${PICFLAG} -DPIC' )
 
 ATLAS_LIBS1=libalapack libatlas libcblas libf77blas libtstatlas
 ATLAS_LIBS2=libptcblas libptf77blas
 
 do-build:
 # make lapack
 .if ! exists(${WRKDIR}/lapack/Makefile)
 	@${ECHO_MSG} "===>  Extracting lapack sub project"
 	@${MKDIR} ${WRKDIR}/lapack
 	@${CP} -r ${PORTSDIR}/math/lapack/files ${WRKDIR}/lapack
 	@${CP} -r ${PORTSDIR}/math/lapack/scripts ${WRKDIR}/lapack
 	@${CP} ${PORTSDIR}/math/lapack/Makefile ${WRKDIR}/lapack
 	@${CP} ${PORTSDIR}/math/lapack/distinfo ${WRKDIR}/lapack
 	@${CP} ${PORTSDIR}/math/lapack/pkg-descr ${WRKDIR}/lapack
 	@cd ${WRKDIR}/lapack ; ${MAKE} "FFLAGS=${FFLAGS}" FC="${FC}" build WRKDIRPREFIX=""
 .endif
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=NON_THREADED)
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=NON_THREADED_PIC)
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED)
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED_PIC)
 # make atlas enhanced lapack (static ver)
 	(cd ${WRKSRC}; ${MKDIR} tmp1 ; \
 		${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp1 ;\
 		cd tmp1 ;\
 		ar x liblapack.a ;\
 		ar x ../lib/NON_THREADED/liblapack.a ;\
 		ar r ../lib/NON_THREADED/libalapack.a *.o ;\
 		ranlib ../lib/NON_THREADED/libalapack.a )
 #  make atlas enhanced lapack (static and thread safe ver)
 	(cd ${WRKSRC}; ${MKDIR} tmp2 ; \
 		${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp2 ;\
 		cd tmp2 ;\
 		ar x liblapack.a ;\
 		ar x ../lib/THREADED/liblapack.a ;\
 		ar r ../lib/THREADED/libalapack.a *.o ;\
 		ranlib ../lib/THREADED/libalapack.a )
 # make atlas enhanced lapack (shared ver)
 	( cd ${WRKSRC}; ${MKDIR} tmp3 ;\
 	${TAR} --exclude "*.f" --exclude "*.po" --exclude "*.o"	-cf - -C ${WRKDIR}/lapack/work/LAPACK/SRC . | ${TAR} xf - -C tmp3 ;\
 		for object in `${FIND} tmp3 -name "*.So"` ; do \
 			n=`${ECHO_CMD} $${object}|${SED} -e 's#.So##'` ; \
 			${MV} $$n.So $$n.o ; \
 		done ; \
 		cd tmp3 ;\
 		ar x ../lib/NON_THREADED_PIC/liblapack.a ;\
 		ar r ../lib/NON_THREADED_PIC/libalapack.a *.o ;\
 		ranlib ../lib/NON_THREADED_PIC/libalapack.a )
 # make atlas enhanced lapack (shared and thread safe ver)
 	( cd ${WRKSRC}; ${MKDIR} tmp4 ;\
 	${TAR} --exclude "*.f" --exclude "*.po" --exclude "*.o"	-cf - -C ${WRKDIR}/lapack/work/LAPACK/SRC . | ${TAR} xf - -C tmp4 ;\
 		for object in `${FIND} tmp4 -name "*.So"` ; do \
 			n=`${ECHO_CMD} $${object}|${SED} -e 's#.So##'` ; \
 			${MV} $$n.So $$n.o ; \
 		done ; \
 		cd tmp4 ;\
 		ar x ../lib/THREADED_PIC/liblapack.a ;\
 		ar r ../lib/THREADED_PIC/libalapack.a *.o ;\
 		ranlib ../lib/THREADED_PIC/libalapack.a )
 
 # make atlas shared library
 .for i in ${ATLAS_LIBS1}
 	( cd ${WRKSRC}/lib/NON_THREADED_PIC/ ; \
 		ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a )
 .endfor
 
 # make atlas shared (thread safe) library
 .for i in ${ATLAS_LIBS1} ${ATLAS_LIBS2}
 	( cd ${WRKSRC}/lib/THREADED_PIC/ ; \
 		ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a )
 .endfor
 
 do-install:
 .for i in ${ATLAS_LIBS1}
 	@${INSTALL_DATA} ${WRKSRC}/lib/NON_THREADED/${i}.a       ${PREFIX}/lib
 	@${INSTALL_DATA} ${WRKSRC}/lib/NON_THREADED_PIC/${i}.so.1    ${PREFIX}/lib
 	@${LN} -sf ${i}.so.1 ${PREFIX}/lib/${i}.so
 .endfor
 .for i in ${ATLAS_LIBS1}
 	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED/${i}.a       ${PREFIX}/lib/${i}_r.a
 	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED_PIC/${i}.so.1    ${PREFIX}/lib/${i}_r.so.1
 	@${LN} -sf ${i}_r.so.1 ${PREFIX}/lib/${i}_r.so
 .endfor
 .for i in ${ATLAS_LIBS2}
 	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED/${i}.a       ${PREFIX}/lib
 	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED_PIC/${i}.so.1    ${PREFIX}/lib
 	@${LN} -sf ${i}.so.1 ${PREFIX}/lib/${i}.so
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/include/cblas.h   ${PREFIX}/include
 	@${INSTALL_DATA} ${WRKSRC}/include/clapack.h ${PREFIX}/include
 	@${INSTALL_DATA} ${FILESDIR}/blas.h    ${PREFIX}/include
 	@${INSTALL_DATA} ${FILESDIR}/lapack.h  ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/math/atlas/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/math/atlas/files/patch-config.c
===================================================================
--- head/math/atlas/files/patch-config.c	(revision 104268)
+++ head/math/atlas/files/patch-config.c	(revision 104269)
@@ -1,138 +1,148 @@
---- config.c.org	Tue Jan 20 22:32:38 2004
-+++ config.c	Tue Jan 20 22:32:54 2004
-@@ -1188,7 +1188,9 @@
+--- config.c.orig	Mon Dec 22 23:06:32 2003
++++ config.c	Wed Mar 17 18:40:50 2004
+@@ -666,7 +666,8 @@
+    sprintf(ln, "%s --version", gcc);
+    if (CmndOneLine(NULL, ln, ln2) == 0)
+    {
+-      *major = GetIntVers(ln2, &j);
++      j=0; for (i=0; ln2[i] && !isspace(ln[i]); i++) j++;
++      *major = GetIntVers(ln2+j, &i);
+       if (*major != -1)
+       {
+          *minor = GetIntVers(ln2+j, &i); j += i;
+@@ -1188,7 +1189,9 @@
     switch(OS)
     {
     case OSOSX:  /* don't know answer */
 -   case OSFreeBSD:  /* don't know answer */
 +   case OSFreeBSD:
 +     if (THREADS) strcpy(LIBS, "%%PTHREAD_LIBS%% -lm");
 +     break;
     case OSLinux:
        break;
     case OSSunOS:
-@@ -1450,9 +1452,9 @@
+@@ -1450,9 +1453,9 @@
           if (THREADS && OS == OSFreeBSD)
           {
              if (which == CPF77)
 -               strcat(flag, " -pthread");
 +               strcat(flag, " %%PTHREAD_LIBS%%");
              else
 -               strcat(flag, " -pthread -D_REENTRANT -D_THREAD_SAFE");
 +               strcat(flag, " %%PTHREAD_LIBS%%  %%PTHREAD_CFLAGS%%");
           }
           break;
        case OSSunOS4:
-@@ -1984,8 +1986,8 @@
+@@ -1984,8 +1987,8 @@
        if (OS == OSFreeBSD)
        {
           if (strstr(comp, "cc"))
 -            strcat(flag, " -pthread -D_REENTRANT -D_THREAD_SAFE");
 -         else strcat(flag, " -pthread");
 +            strcat(flag, " %%PTHREAD_LIBS%% %%PTHREAD_CFLAGS%%");
 +         else strcat(flag, " %%PTHREAD_LIBS%%");
        }
     }
     return(*comp ? comp : NULL);
-@@ -2801,7 +2801,7 @@
+@@ -2799,7 +2802,7 @@
        else if (strstr(ln, "ia64")) la = LAIA64;
        else if ( strstr(ln, "i686") || strstr(ln, "i586") ||
                  strstr(ln, "i486") || strstr(ln, "i386") ||
 -                strstr(ln, "x86_64") ) la = LAX86;
 +                strstr(ln, "x86_64") || strstr(ln, "amd64")  ) la = LAX86;
     }
     return(la);
  }
-@@ -2835,12 +2837,22 @@
+@@ -2835,12 +2838,22 @@
           }
           break;
        case LASPARC: /* don't know */
 +         if (!CmndOneLine(targ, "sysctl hw.model", ln))
 +         {
 +            if (strstr(ln, "UltraSparc-II")) mach = SunUS2;
 +            if (strstr(ln, "UltraSparc-I")) mach = SunUS1;
 +            if (strstr(ln, "UltraSparc")) mach = SunUSX;
 +            else mach = SunUSX;
 +         }
           break;
        case LAALPHA:
           if (!CmndOneLine(targ, "sysctl hw.model", ln))
           {
              if (strstr(ln, "433au")) mach = Dec21164;
 +            else if (strstr(ln, "500au")) mach = Dec21164;
 +            else if (strstr(ln, "AlphaPC 164")) mach = Dec21164;
              else if (strstr(ln, "XP1000")) mach = Dec21264;
 +            else mach = Dec21264;
           }
           break;
        case LAIA64: /* don't know */
-@@ -2849,14 +2861,32 @@
+@@ -2849,14 +2862,32 @@
           if (!CmndOneLine(targ, "sysctl hw.model", ln))
           {
              if (strstr(ln, "Pentium Pro")) mach = IntPPRO;
 +            else if (strstr(ln, "Pentium(R) Pro")) mach = IntPPRO;
 +            else if (strstr(ln, "Pentium 4")) mach = IntP4;
 +            else if (strstr(ln, "Pentium(R) 4")) mach = IntP4;
 +            else if (strstr(ln, "Pentium(R) M")) mach = IntP4;
              else if (strstr(ln, "Pentium III")) mach = IntPIII;
 -            else if (strstr(ln, "Pentium II ")) mach = IntPII;
 +            else if (strstr(ln, "Pentium III/Pentium III")) mach = IntPIII;
 +            else if (strstr(ln, "Pentium(R) III")) mach = IntPIII;
 +            else if (strstr(ln, "Pentium II")) mach = IntPII;
 +            else if (strstr(ln, "Pentium II/PentiumII")) mach = IntPII;
 +            else if (strstr(ln, "Pentium(R) II ")) mach = IntPII;
 +            else if (strstr(ln, "Celeron")) mach = IntPII;
 +            else if (strstr(ln, "Celeron(R)")) mach = IntPII;
 +            else if (strstr(ln, "Opteron(tm)") && sizeof(void *)==4) mach = AmdHammer32;
 +            else if (strstr(ln, "Opteron(tm)") && sizeof(void *)==8) mach = AmdHammer64;
 +            else if (strstr(ln, "AMD Athlon(tm) 64") && sizeof(void *)==4) mach = AmdHammer32;
 +            else if (strstr(ln, "AMD Athlon(tm) 64") && sizeof(void *)==8) mach = AmdHammer64;
 +            else if (strstr(ln, "Athlon(tm)")) mach = AmdAthlon;
              else if (strstr(ln, "Athlon")) mach = AmdAthlon;
              else if (strstr(ln, "AMD-K7")) mach = AmdAthlon;
 -            else if (strstr(ln, "32 bit Hammer")) mach = AmdHammer32;
 -            else if (strstr(ln, "64 bit Hammer")) mach = AmdHammer64;
 -            else if (strstr(ln, "Pentium/P55C")) mach = IntP5MMX; /* sent by */
 -            else if (strstr(ln, "Pentium")) mach=IntP5;       /* Nakata Maho */
 +            else if (strstr(ln, "AMD-K6(tm)")) mach = IntP5MMX;
 +            else if (strstr(ln, "Pentium/P55C")) mach = IntP5MMX;
 +            else if (strstr(ln, "Pentium/P54C")) mach=IntP5;
 +            else if (strstr(ln, "Pentium")) mach=IntP5;
 +            else if (strstr(ln, "VIA"))     mach=IntP5MMX;       
 +            else if (strstr(ln, "Crusoe(tm)")) mach=IntP5MMX;       
 +            else mach = IntP5;
           }
           break;
        default:;
-@@ -3641,8 +3671,8 @@
+@@ -3641,8 +3672,8 @@
     }
     if (THREADS) /* add ncpu to ARCH */
     {
 -      for (i=0; ARCH[i]; i++);
 -      sprintf(ARCH+i, "_%d", ncpu);
 +//      for (i=0; ARCH[i]; i++); // do not add number of cpu for ARCHNAME
 +//      sprintf(ARCH+i, "_%d", ncpu); // #cpu can be different in general
     }
     do
     {
-@@ -4047,9 +4077,9 @@
+@@ -4047,9 +4078,9 @@
     if (mach == IA64Itan || mach == IA64Itan2 )
        fprintf(fpout, " -DATL_MAXNREG=128");
     if (ASMD != ASM_None) fprintf(fpout, " -DATL_%s", ASMNAM[ASMD]);
 -   if (mach == AmdHammer32 && (OS != OSWinNT && OS != OSWin9x))
 +   if (mach == AmdHammer32 && (OS != OSWinNT && OS != OSWin9x && OS != OSFreeBSD))
        fprintf(fpout, " -m32");
 -   else if (mach == AmdHammer64) fprintf(fpout, " -m64");
 +   else if (mach == AmdHammer64 && (OS != OSFreeBSD)) fprintf(fpout, " -m64");
     if (mach == IA64Itan2 && strstr(CC, "icc"))
        fprintf(fpout, " -DATL_IntelIccBugs");
     fprintf(fpout, "\n\n");
-@@ -4080,7 +4095,7 @@
+@@ -4080,7 +4111,7 @@
     if (THREADS)
     {
        fprintf(fpout, " -DATL_NCPU=%d", ncpu);
 -      if (OS == OSFreeBSD) fprintf(fpout, " -D_THREAD_SAFE -D_REENTRANT");
 +      if (OS == OSFreeBSD) fprintf(fpout, " %%PTHREAD_CFLAGS%%");
        if (OS == OSAIX) fprintf(fpout, " -DIBM_PT_ERROR");
        if (OS == OSIRIX) fprintf(fpout, " -D_POSIX_C_SOURCE=199506L");
     }

Property changes on: head/math/atlas/files/patch-config.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/math/atlas-devel/Makefile
===================================================================
--- head/math/atlas-devel/Makefile	(revision 104268)
+++ head/math/atlas-devel/Makefile	(revision 104269)
@@ -1,179 +1,178 @@
 # New ports collection makefile for:	atlas-devel
 # Date created:		14 September 2003
 # Whom:			Nakata Maho <maho@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 # NOTE: This port purposely ignores the CC and CFLAGS settings.
 #       Program and compiler flags are finetuned to gcc.
 
 PORTNAME=	atlas
 PORTVERSION=	3.7.1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	math-atlas
 PKGNAMESUFFIX=  -devel
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=        Development version of math/atlas
 
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/ATLAS
 INSTALLS_SHLIB= yes
 USE_REINPLACE=  yes
 NO_PACKAGE=	runtime performance heavily depends on building environment
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 501000 && ${MACHINE_ARCH} == "alpha"
 USE_GCC=3.3
 .endif
 
 # only affects for lapack sub project
 .if defined(WITH_OPTIMIZED_FLAGS)
 FFLAGS+= -pipe -O3 -ffast-math -finline-functions -fstrength-reduce -funroll-loops -fexpensive-optimizations
 .if (${MACHINE_ARCH} == "i386" && !${MACHINE_ARCH} == "amd64" )
 FFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double
 .endif # i386
 .endif
 
 post-patch:
 .if !defined(WITH_OPTIMIZED_FLAGS)
 	@${ECHO_CMD} "You can optimize lapack sub project by setting WITH_OPTIMIZED_FLAGS=yes."
 .endif
-	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+ ${PTHREAD_CFLAGS}+' \
+	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' \
+			  -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g' \
 		${WRKSRC}/config.c
-	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+ ${PTHREAD_LIBS}+' \
-		${WRKSRC}/config.c
 .if (${MACHINE_ARCH} == "alpha")
 	@(cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/alpha-patch)
 .endif
 
 .if !defined(PICFLAG)
 .if ${MACHINE_ARCH} == "sparc64"
 PICFLAG=-fPIC
 .else
 PICFLAG=-fpic
 .endif
 .endif
 
 ANSWER_i386?=	${PRINTF} "\n\n\n\n\n\n\n\n\n\n"
 ANSWER_ia64?=	${PRINTF} "\n\n\n2\n\n\n\n\nf77\n-O2 -static\n\n"
 
 .if !defined(ANSWER_${ARCH})
 ANSWER=	${ANSWER_i386}
 .else
 ANSWER=	${ANSWER_${ARCH}}
 .endif
 
 do-configure:
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} xconfig && \
-		${ANSWER} | ./xconfig -N 1 -c ${CC} -f ${FC} -a NON_THREADED && \
-		${ANSWER} | ./xconfig -N 1 -c ${CC} -f ${FC} -a NON_THREADED_PIC \
+		${ANSWER} | ./xconfig -N 1 -c ${CC} -f ${FC} -m ${CC} -g ${CC} -x ${CC} -a NON_THREADED && \
+		${ANSWER} | ./xconfig -N 1 -c ${CC} -f ${FC} -m ${CC} -g ${CC} -x ${CC} -a NON_THREADED_PIC \
 			-F c '${PICFLAG} -DPIC' -F f '${PICFLAG} -DPIC' \
 			-F m '${PICFLAG} -DPIC' -F x '${PICFLAG} -DPIC')
 	@(cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/thread-patch && \
 		${MAKE_ENV} ${MAKE} xconfig && \
-		${ANSWER} | ./xconfig -c ${CC} -f ${FC} -a THREADED && \
-		${ANSWER} | ./xconfig -c ${CC} -f ${FC} -a THREADED_PIC \
+		${ANSWER} | ./xconfig -c ${CC} -f ${FC} -m ${CC} -g ${CC} -x ${CC} -a THREADED && \
+		${ANSWER} | ./xconfig -c ${CC} -f ${FC} -m ${CC} -g ${CC} -x ${CC} -a THREADED_PIC \
 			-F c '${PICFLAG} -DPIC' -F f '${PICFLAG} -DPIC' \
 			-F m '${PICFLAG} -DPIC' -F x '${PICFLAG} -DPIC' )
 
 ATLAS_LIBS1=libalapack libatlas libcblas libf77blas libtstatlas
 ATLAS_LIBS2=libptcblas libptf77blas
 
 do-build:
 # make lapack
 .if ! exists(${WRKDIR}/lapack/Makefile)
 	@${ECHO_MSG} "===>  Extracting lapack sub project"
 	@${MKDIR} ${WRKDIR}/lapack
 	@${CP} -r ${PORTSDIR}/math/lapack/files ${WRKDIR}/lapack
 	@${CP} -r ${PORTSDIR}/math/lapack/scripts ${WRKDIR}/lapack
 	@${CP} ${PORTSDIR}/math/lapack/Makefile ${WRKDIR}/lapack
 	@${CP} ${PORTSDIR}/math/lapack/distinfo ${WRKDIR}/lapack
 	@${CP} ${PORTSDIR}/math/lapack/pkg-descr ${WRKDIR}/lapack
 	@cd ${WRKDIR}/lapack ; ${MAKE} "FFLAGS=${FFLAGS}" FC="${FC}" build WRKDIRPREFIX=""
 .endif
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=NON_THREADED)
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=NON_THREADED_PIC)
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED)
 	@(cd ${WRKSRC}; ${MAKE_ENV} ${MAKE} install arch=THREADED_PIC)
 # make atlas enhanced lapack (static ver)
 	(cd ${WRKSRC}; ${MKDIR} tmp1 ; \
 		${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp1 ;\
 		cd tmp1 ;\
 		ar x liblapack.a ;\
 		ar x ../lib/NON_THREADED/liblapack.a ;\
 		ar r ../lib/NON_THREADED/libalapack.a *.o ;\
 		ranlib ../lib/NON_THREADED/libalapack.a )
 #  make atlas enhanced lapack (static and thread safe ver)
 	(cd ${WRKSRC}; ${MKDIR} tmp2 ; \
 		${CP} ${WRKDIR}/lapack/work/LAPACK/SRC/liblapack.a tmp2 ;\
 		cd tmp2 ;\
 		ar x liblapack.a ;\
 		ar x ../lib/THREADED/liblapack.a ;\
 		ar r ../lib/THREADED/libalapack.a *.o ;\
 		ranlib ../lib/THREADED/libalapack.a )
 # make atlas enhanced lapack (shared ver)
 	( cd ${WRKSRC}; ${MKDIR} tmp3 ;\
 	${TAR} --exclude "*.f" --exclude "*.po" --exclude "*.o"	-cf - -C ${WRKDIR}/lapack/work/LAPACK/SRC . | ${TAR} xf - -C tmp3 ;\
 		for object in `${FIND} tmp3 -name "*.So"` ; do \
 			n=`${ECHO_CMD} $${object}|${SED} -e 's#.So##'` ; \
 			${MV} $$n.So $$n.o ; \
 		done ; \
 		cd tmp3 ;\
 		ar x ../lib/NON_THREADED_PIC/liblapack.a ;\
 		ar r ../lib/NON_THREADED_PIC/libalapack.a *.o ;\
 		ranlib ../lib/NON_THREADED_PIC/libalapack.a )
 # make atlas enhanced lapack (shared and thread safe ver)
 	( cd ${WRKSRC}; ${MKDIR} tmp4 ;\
 	${TAR} --exclude "*.f" --exclude "*.po" --exclude "*.o"	-cf - -C ${WRKDIR}/lapack/work/LAPACK/SRC . | ${TAR} xf - -C tmp4 ;\
 		for object in `${FIND} tmp4 -name "*.So"` ; do \
 			n=`${ECHO_CMD} $${object}|${SED} -e 's#.So##'` ; \
 			${MV} $$n.So $$n.o ; \
 		done ; \
 		cd tmp4 ;\
 		ar x ../lib/THREADED_PIC/liblapack.a ;\
 		ar r ../lib/THREADED_PIC/libalapack.a *.o ;\
 		ranlib ../lib/THREADED_PIC/libalapack.a )
 
 # make atlas shared library
 .for i in ${ATLAS_LIBS1}
 	( cd ${WRKSRC}/lib/NON_THREADED_PIC/ ; \
 		ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a )
 .endfor
 
 # make atlas shared (thread safe) library
 .for i in ${ATLAS_LIBS1} ${ATLAS_LIBS2}
 	( cd ${WRKSRC}/lib/THREADED_PIC/ ; \
 		ld -Bshareable -o ${i}.so.1 -x -soname ${i}.so.1 --whole-archive ${i}.a )
 .endfor
 
 do-install:
 .for i in ${ATLAS_LIBS1}
 	@${INSTALL_DATA} ${WRKSRC}/lib/NON_THREADED/${i}.a       ${PREFIX}/lib
 	@${INSTALL_DATA} ${WRKSRC}/lib/NON_THREADED_PIC/${i}.so.1    ${PREFIX}/lib
 	@${LN} -sf ${i}.so.1 ${PREFIX}/lib/${i}.so
 .endfor
 .for i in ${ATLAS_LIBS1}
 	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED/${i}.a       ${PREFIX}/lib/${i}_r.a
 	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED_PIC/${i}.so.1    ${PREFIX}/lib/${i}_r.so.1
 	@${LN} -sf ${i}_r.so.1 ${PREFIX}/lib/${i}_r.so
 .endfor
 .for i in ${ATLAS_LIBS2}
 	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED/${i}.a       ${PREFIX}/lib
 	@${INSTALL_DATA} ${WRKSRC}/lib/THREADED_PIC/${i}.so.1    ${PREFIX}/lib
 	@${LN} -sf ${i}.so.1 ${PREFIX}/lib/${i}.so
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/include/cblas.h   ${PREFIX}/include
 	@${INSTALL_DATA} ${WRKSRC}/include/clapack.h ${PREFIX}/include
 	@${INSTALL_DATA} ${FILESDIR}/blas.h    ${PREFIX}/include
 	@${INSTALL_DATA} ${FILESDIR}/lapack.h  ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/math/atlas-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/math/atlas-devel/files/patch-config.c
===================================================================
--- head/math/atlas-devel/files/patch-config.c	(revision 104268)
+++ head/math/atlas-devel/files/patch-config.c	(revision 104269)
@@ -1,138 +1,148 @@
---- config.c.org	Tue Jan 20 22:32:38 2004
-+++ config.c	Tue Jan 20 22:32:54 2004
-@@ -1188,7 +1188,9 @@
+--- config.c.orig	Mon Dec 22 23:06:32 2003
++++ config.c	Wed Mar 17 18:40:50 2004
+@@ -666,7 +666,8 @@
+    sprintf(ln, "%s --version", gcc);
+    if (CmndOneLine(NULL, ln, ln2) == 0)
+    {
+-      *major = GetIntVers(ln2, &j);
++      j=0; for (i=0; ln2[i] && !isspace(ln[i]); i++) j++;
++      *major = GetIntVers(ln2+j, &i);
+       if (*major != -1)
+       {
+          *minor = GetIntVers(ln2+j, &i); j += i;
+@@ -1188,7 +1189,9 @@
     switch(OS)
     {
     case OSOSX:  /* don't know answer */
 -   case OSFreeBSD:  /* don't know answer */
 +   case OSFreeBSD:
 +     if (THREADS) strcpy(LIBS, "%%PTHREAD_LIBS%% -lm");
 +     break;
     case OSLinux:
        break;
     case OSSunOS:
-@@ -1450,9 +1452,9 @@
+@@ -1450,9 +1453,9 @@
           if (THREADS && OS == OSFreeBSD)
           {
              if (which == CPF77)
 -               strcat(flag, " -pthread");
 +               strcat(flag, " %%PTHREAD_LIBS%%");
              else
 -               strcat(flag, " -pthread -D_REENTRANT -D_THREAD_SAFE");
 +               strcat(flag, " %%PTHREAD_LIBS%%  %%PTHREAD_CFLAGS%%");
           }
           break;
        case OSSunOS4:
-@@ -1984,8 +1986,8 @@
+@@ -1984,8 +1987,8 @@
        if (OS == OSFreeBSD)
        {
           if (strstr(comp, "cc"))
 -            strcat(flag, " -pthread -D_REENTRANT -D_THREAD_SAFE");
 -         else strcat(flag, " -pthread");
 +            strcat(flag, " %%PTHREAD_LIBS%% %%PTHREAD_CFLAGS%%");
 +         else strcat(flag, " %%PTHREAD_LIBS%%");
        }
     }
     return(*comp ? comp : NULL);
-@@ -2801,7 +2801,7 @@
+@@ -2799,7 +2802,7 @@
        else if (strstr(ln, "ia64")) la = LAIA64;
        else if ( strstr(ln, "i686") || strstr(ln, "i586") ||
                  strstr(ln, "i486") || strstr(ln, "i386") ||
 -                strstr(ln, "x86_64") ) la = LAX86;
 +                strstr(ln, "x86_64") || strstr(ln, "amd64")  ) la = LAX86;
     }
     return(la);
  }
-@@ -2835,12 +2837,22 @@
+@@ -2835,12 +2838,22 @@
           }
           break;
        case LASPARC: /* don't know */
 +         if (!CmndOneLine(targ, "sysctl hw.model", ln))
 +         {
 +            if (strstr(ln, "UltraSparc-II")) mach = SunUS2;
 +            if (strstr(ln, "UltraSparc-I")) mach = SunUS1;
 +            if (strstr(ln, "UltraSparc")) mach = SunUSX;
 +            else mach = SunUSX;
 +         }
           break;
        case LAALPHA:
           if (!CmndOneLine(targ, "sysctl hw.model", ln))
           {
              if (strstr(ln, "433au")) mach = Dec21164;
 +            else if (strstr(ln, "500au")) mach = Dec21164;
 +            else if (strstr(ln, "AlphaPC 164")) mach = Dec21164;
              else if (strstr(ln, "XP1000")) mach = Dec21264;
 +            else mach = Dec21264;
           }
           break;
        case LAIA64: /* don't know */
-@@ -2849,14 +2861,32 @@
+@@ -2849,14 +2862,32 @@
           if (!CmndOneLine(targ, "sysctl hw.model", ln))
           {
              if (strstr(ln, "Pentium Pro")) mach = IntPPRO;
 +            else if (strstr(ln, "Pentium(R) Pro")) mach = IntPPRO;
 +            else if (strstr(ln, "Pentium 4")) mach = IntP4;
 +            else if (strstr(ln, "Pentium(R) 4")) mach = IntP4;
 +            else if (strstr(ln, "Pentium(R) M")) mach = IntP4;
              else if (strstr(ln, "Pentium III")) mach = IntPIII;
 -            else if (strstr(ln, "Pentium II ")) mach = IntPII;
 +            else if (strstr(ln, "Pentium III/Pentium III")) mach = IntPIII;
 +            else if (strstr(ln, "Pentium(R) III")) mach = IntPIII;
 +            else if (strstr(ln, "Pentium II")) mach = IntPII;
 +            else if (strstr(ln, "Pentium II/PentiumII")) mach = IntPII;
 +            else if (strstr(ln, "Pentium(R) II ")) mach = IntPII;
 +            else if (strstr(ln, "Celeron")) mach = IntPII;
 +            else if (strstr(ln, "Celeron(R)")) mach = IntPII;
 +            else if (strstr(ln, "Opteron(tm)") && sizeof(void *)==4) mach = AmdHammer32;
 +            else if (strstr(ln, "Opteron(tm)") && sizeof(void *)==8) mach = AmdHammer64;
 +            else if (strstr(ln, "AMD Athlon(tm) 64") && sizeof(void *)==4) mach = AmdHammer32;
 +            else if (strstr(ln, "AMD Athlon(tm) 64") && sizeof(void *)==8) mach = AmdHammer64;
 +            else if (strstr(ln, "Athlon(tm)")) mach = AmdAthlon;
              else if (strstr(ln, "Athlon")) mach = AmdAthlon;
              else if (strstr(ln, "AMD-K7")) mach = AmdAthlon;
 -            else if (strstr(ln, "32 bit Hammer")) mach = AmdHammer32;
 -            else if (strstr(ln, "64 bit Hammer")) mach = AmdHammer64;
 -            else if (strstr(ln, "Pentium/P55C")) mach = IntP5MMX; /* sent by */
 -            else if (strstr(ln, "Pentium")) mach=IntP5;       /* Nakata Maho */
 +            else if (strstr(ln, "AMD-K6(tm)")) mach = IntP5MMX;
 +            else if (strstr(ln, "Pentium/P55C")) mach = IntP5MMX;
 +            else if (strstr(ln, "Pentium/P54C")) mach=IntP5;
 +            else if (strstr(ln, "Pentium")) mach=IntP5;
 +            else if (strstr(ln, "VIA"))     mach=IntP5MMX;       
 +            else if (strstr(ln, "Crusoe(tm)")) mach=IntP5MMX;       
 +            else mach = IntP5;
           }
           break;
        default:;
-@@ -3641,8 +3671,8 @@
+@@ -3641,8 +3672,8 @@
     }
     if (THREADS) /* add ncpu to ARCH */
     {
 -      for (i=0; ARCH[i]; i++);
 -      sprintf(ARCH+i, "_%d", ncpu);
 +//      for (i=0; ARCH[i]; i++); // do not add number of cpu for ARCHNAME
 +//      sprintf(ARCH+i, "_%d", ncpu); // #cpu can be different in general
     }
     do
     {
-@@ -4047,9 +4077,9 @@
+@@ -4047,9 +4078,9 @@
     if (mach == IA64Itan || mach == IA64Itan2 )
        fprintf(fpout, " -DATL_MAXNREG=128");
     if (ASMD != ASM_None) fprintf(fpout, " -DATL_%s", ASMNAM[ASMD]);
 -   if (mach == AmdHammer32 && (OS != OSWinNT && OS != OSWin9x))
 +   if (mach == AmdHammer32 && (OS != OSWinNT && OS != OSWin9x && OS != OSFreeBSD))
        fprintf(fpout, " -m32");
 -   else if (mach == AmdHammer64) fprintf(fpout, " -m64");
 +   else if (mach == AmdHammer64 && (OS != OSFreeBSD)) fprintf(fpout, " -m64");
     if (mach == IA64Itan2 && strstr(CC, "icc"))
        fprintf(fpout, " -DATL_IntelIccBugs");
     fprintf(fpout, "\n\n");
-@@ -4080,7 +4095,7 @@
+@@ -4080,7 +4111,7 @@
     if (THREADS)
     {
        fprintf(fpout, " -DATL_NCPU=%d", ncpu);
 -      if (OS == OSFreeBSD) fprintf(fpout, " -D_THREAD_SAFE -D_REENTRANT");
 +      if (OS == OSFreeBSD) fprintf(fpout, " %%PTHREAD_CFLAGS%%");
        if (OS == OSAIX) fprintf(fpout, " -DIBM_PT_ERROR");
        if (OS == OSIRIX) fprintf(fpout, " -D_POSIX_C_SOURCE=199506L");
     }

Property changes on: head/math/atlas-devel/files/patch-config.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property