Attachment #200235 for bug #234141

View | Details | Raw Unified | Return to bug 234141 | Differences between
Collapse All | Expand All





PORTNAME=	taucs
PORTVERSION=	2.2
PORTREVISION=	20
CATEGORIES=	math
MASTER_SITES=	http://www.tau.ac.il/~stoledo/taucs/${PORTVERSION}/ \
		LOCAL/bf

LICENSE_FILE=	${FILESDIR}/TAUCS-license.txt
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

LIB_DEPENDS=	libmetis.so:math/metis

HAS_CONFIGURE=	yes
USES=		blaslapack fortran tar:tgz
USE_LDCONFIG=	yes

NO_WRKSUBDIR=	yes
HAS_CONFIGURE=	yes

OPTIONS_DEFINE=	DOCS


	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}

do-test: # XXX: building tests fail
.for t in ${TESTS}
	@${PRINTF} "\n%s\n" "Building test_${t}"
	@cd ${WRKSRC}_SHARED ; ${FC} ${FFLAGS} -Llib/FreeBSD -L./ \




--- src/taucs_memory.c.orig	2003-09-01 06:16:13 UTC
+++ src/taucs_memory.c
@@ -123,7 +123,6 @@ double taucs_system_memory_size()
 }
 #endif
 
-#ifdef OSTYPE_darwin
 #define TAUCS_SYSTEM_MEMORY_SIZE_DEFINED
 
 /* This is a BSD4.4 interface, so it should work on other BSD systems */
@@ -134,15 +133,15 @@ double taucs_system_memory_size()
 double taucs_system_memory_size()
 {
   int mib[2] = { CTL_HW, HW_PHYSMEM };
-  int int_retval;
+  unsigned long int_retval;
   size_t len = sizeof(int);
   
   taucs_printf("taucs_system_memory_size: calling sysctl\n");
   mib[1] = HW_PAGESIZE;
   if ( sysctl(mib,2,
 	      &int_retval,&len,
-	      NULL, 0)) {
-    taucs_printf("taucs_system_memory_size: ERROR, sysctl failed (on darwin)\n");
+	      NULL, 0) < 0) {
+    taucs_printf("taucs_system_memory_size: ERROR, HW_PAGESIZE sysctl failed (on bsd)\n");
     return -1.0;
   }
   taucs_printf("  sysctl pagesize %d bytes\n",int_retval);
@@ -150,15 +149,14 @@ double taucs_system_memory_size()
   mib[1] = HW_PHYSMEM;
   if ( sysctl(mib,2,
 	      &int_retval,&len,
-	      NULL, 0)) {
-    taucs_printf("taucs_system_memory_size: ERROR, sysctl failed (on darwin)\n");
+	      NULL, 0) < 0) {
+    taucs_printf("taucs_system_memory_size: ERROR, HW_PHYSMEM sysctl failed (on bsd)\n");
     return -1.0;
   }
   taucs_printf("  sysctl physmem %d bytes\n",int_retval);
 
   return (double) int_retval;
 }
-#endif
 
 #ifdef OSTYPE_aix
 #define TAUCS_SYSTEM_MEMORY_SIZE_DEFINED

Return to bug 234141

Lines 3-9 Link Here

(-)math/taucs/Makefile (-4 / +5 lines)
3		3
4	PORTNAME= taucs	4	PORTNAME= taucs
5	PORTVERSION= 2.2	5	PORTVERSION= 2.2
6	PORTREVISION= 19	6	PORTREVISION= 20
7	CATEGORIES= math	7	CATEGORIES= math
8	MASTER_SITES= http://www.tau.ac.il/~stoledo/taucs/${PORTVERSION}/ \	8	MASTER_SITES= http://www.tau.ac.il/~stoledo/taucs/${PORTVERSION}/ \
9	LOCAL/bf	9	LOCAL/bf
Lines 17-28 Link Here
17	LICENSE_FILE= ${FILESDIR}/TAUCS-license.txt	17	LICENSE_FILE= ${FILESDIR}/TAUCS-license.txt
18	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	18	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
19		19
20	LIB_DEPENDS= libmetis.so:math/metis4	20	LIB_DEPENDS= libmetis.so:math/metis
21		21
22	HAS_CONFIGURE= yes
23	USES= blaslapack fortran tar:tgz	22	USES= blaslapack fortran tar:tgz
24	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
		24
25	NO_WRKSUBDIR= yes	25	NO_WRKSUBDIR= yes
		26	HAS_CONFIGURE= yes
26		27
27	OPTIONS_DEFINE= DOCS	28	OPTIONS_DEFINE= DOCS
28		29
Lines 92-98 Link Here
92	@${MKDIR} ${STAGEDIR}${DOCSDIR}	93	@${MKDIR} ${STAGEDIR}${DOCSDIR}
93	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}	94	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}
94		95
95	do-test: # XXX: building tests fail	96	do-test: # XXX: building tests fail
96	.for t in ${TESTS}	97	.for t in ${TESTS}
97	@${PRINTF} "\n%s\n" "Building test_${t}"	98	@${PRINTF} "\n%s\n" "Building test_${t}"
98	@cd ${WRKSRC}_SHARED ; ${FC} ${FFLAGS} -Llib/FreeBSD -L./ \	99	@cd ${WRKSRC}_SHARED ; ${FC} ${FFLAGS} -Llib/FreeBSD -L./ \

Line 0 Link Here

(-)math/taucs/files/patch-src_taucs__memory.c (+47 lines)
	1	--- src/taucs_memory.c.orig 2003-09-01 06:16:13 UTC
	2	+++ src/taucs_memory.c
	3	@@ -123,7 +123,6 @@ double taucs_system_memory_size()
	4	}
	5	#endif
	6
	7	-#ifdef OSTYPE_darwin
	8	#define TAUCS_SYSTEM_MEMORY_SIZE_DEFINED
	9
	10	/* This is a BSD4.4 interface, so it should work on other BSD systems */
	11	@@ -134,15 +133,15 @@ double taucs_system_memory_size()
	12	double taucs_system_memory_size()
	13	{
	14	int mib[2] = { CTL_HW, HW_PHYSMEM };
	15	- int int_retval;
	16	+ unsigned long int_retval;
	17	size_t len = sizeof(int);
	18
	19	taucs_printf("taucs_system_memory_size: calling sysctl\n");
	20	mib[1] = HW_PAGESIZE;
	21	if ( sysctl(mib,2,
	22	&int_retval,&len,
	23	- NULL, 0)) {
	24	- taucs_printf("taucs_system_memory_size: ERROR, sysctl failed (on darwin)\n");
	25	+ NULL, 0) < 0) {
	26	+ taucs_printf("taucs_system_memory_size: ERROR, HW_PAGESIZE sysctl failed (on bsd)\n");
	27	return -1.0;
	28	}
	29	taucs_printf(" sysctl pagesize %d bytes\n",int_retval);
	30	@@ -150,15 +149,14 @@ double taucs_system_memory_size()
	31	mib[1] = HW_PHYSMEM;
	32	if ( sysctl(mib,2,
	33	&int_retval,&len,
	34	- NULL, 0)) {
	35	- taucs_printf("taucs_system_memory_size: ERROR, sysctl failed (on darwin)\n");
	36	+ NULL, 0) < 0) {
	37	+ taucs_printf("taucs_system_memory_size: ERROR, HW_PHYSMEM sysctl failed (on bsd)\n");
	38	return -1.0;
	39	}
	40	taucs_printf(" sysctl physmem %d bytes\n",int_retval);
	41
	42	return (double) int_retval;
	43	}
	44	-#endif
	45
	46	#ifdef OSTYPE_aix
	47	#define TAUCS_SYSTEM_MEMORY_SIZE_DEFINED