Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Jun 2004 14:58:40 +0200 (CEST)
From:      "Thomas E. Zander" <riggs@rrr.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/67752: Upgrade math/cxsc to the latest revision
Message-ID:  <200406091258.i59CweNP012818@curry.mchp.siemens.de>
Resent-Message-ID: <200406091300.i59D0llj003550@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         67752
>Category:       ports
>Synopsis:       Upgrade math/cxsc to the latest revision
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 09 13:00:47 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Thomas E. Zander
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD trillian.ofw.tld 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Tue Jun 8 12:25:03 CEST 2004 root@trillian.ofw.tld:/usr/obj/usr/src/sys/TRILLIAN i386


	
>Description:
This update contains the following changes to math/cxsc
o Update to latest version 2.0 beta 3
o Take maintainership
o Introduce files/patch-src::rts::s_date.c to resolve build problems
o Respect CFLAGS and CXXFLAGS again (the former mentioned needs of too
  much RAM is no problem for today's average computers)
>How-To-Repeat:
>Fix:
Please apply this to math/cxsc:


diff -ruN cxsc-old/Makefile cxsc/Makefile
--- cxsc-old/Makefile	Wed Feb  4 06:07:27 2004
+++ cxsc/Makefile	Wed Jun  9 13:51:48 2004
@@ -7,17 +7,22 @@
 #
 
 PORTNAME=	cxsc
-PORTVERSION=	2.0b
-PORTREVISION=	1
+PORTVERSION=	2.0b3
 CATEGORIES=	math devel
 MASTER_SITES=	http://www.math.uni-wuppertal.de/wrswt/xsc/cxsc/
-DISTNAME=	${PORTNAME}-2-0-beta
+DISTNAME=	${PORTNAME}-2-0-beta3
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	riggs@rrr.de
 COMMENT=	C++ class library for eXtended Scientific Computing
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
-MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}" \
+		CCFLAGS="${CFLAGS}"
+CFLAGS+=	${CXSC_C_INC}
+CXXFLAGS+=	${CXSC_CXX_INC}
+
+CXSC_C_INC=	-I. -I../.. -I../rts
+CXSC_CXX_INC=	-I.. -Irts -Ifi_lib
 
 .include <bsd.port.mk>
diff -ruN cxsc-old/distinfo cxsc/distinfo
--- cxsc-old/distinfo	Thu Jan 29 17:10:04 2004
+++ cxsc/distinfo	Tue Jun  8 10:10:07 2004
@@ -1,2 +1,2 @@
-MD5 (cxsc-2-0-beta.tar.gz) = 62e425fd15d756f460b7c11b2b3bb801
-SIZE (cxsc-2-0-beta.tar.gz) = 785745
+MD5 (cxsc-2-0-beta3.tar.gz) = 1e26e955dadf103c39eb81cd4ebf1762
+SIZE (cxsc-2-0-beta3.tar.gz) = 820486
diff -ruN cxsc-old/files/patch-Makefile cxsc/files/patch-Makefile
--- cxsc-old/files/patch-Makefile	Tue Mar 26 03:02:09 2002
+++ cxsc/files/patch-Makefile	Wed Jun  9 14:17:02 2004
@@ -1,35 +1,48 @@
---- Makefile.orig	Thu Aug  9 10:50:35 2001
-+++ Makefile	Mon Mar 25 17:26:19 2002
-@@ -2,19 +2,18 @@
+--- Makefile.orig	Wed Dec 17 19:12:59 2003
++++ Makefile	Wed Jun  9 14:16:45 2004
+@@ -5,7 +5,6 @@
  
  # (un-)installation prefix
  # e.g. /usr/local/cxsc or local home directory
--export PREFIX=/home/user/cxsc
+-PREFIX=/home/user/cxsc
  
- #========= the following commands should work on most Unix systems ========
+ # which C++ compiler? 
+ # Possible values: gnu         for the GNU C/C++ Compiler (gcc)
+@@ -74,14 +73,14 @@
  
--export CC=gcc#                  name of the C compiler
--export CCOPTS=-Wall#            optional flags to give to the C compiler
-+#export CC=gcc#                  name of the C compiler
-+#export CCOPTS=-Wall#            optional flags to give to the C compiler
- export CCINC=-I. -I../.. -I../rts# 
-                                 # additional include path
- export CCFLAGS=$(CCINC) $(CCOPTS)#
- 			        # extra flags to give to the C compiler
+ # Settings for all systems -------------------------------------------
  
--export CXX=g++#                 name of the C++ compiler
--export CXXOPTS=-Wall -Winline#  optional flags to give to the C++ compiler
-+#export CXX=g++#                 name of the C++ compiler
-+#export CXXOPTS=-Wall -Winline#  optional flags to give to the C++ compiler
-                                 # -O3# at the moment without optimization 
-                                 # (takes too much RAM)
- export CXXINC=-I. -I.. -Irts/ -Ifi_lib#
-@@ -29,7 +28,7 @@
- export RM=rm -f#                remove files (forced)
- export RMDIR=rm -rf#            remove directory
- 
--export INSTALL=install -m 644#  copy files
-+export INSTALL=${INSTALL_DATA}#  copy files
- export STRIP=strip -g#          strip executables from debug symbols
- export INSTDIR=install -d#      create installation directory
+-CCINC=-I. -I../.. -I../rts# 
++#CCINC=-I. -I../.. -I../rts# 
+                                 # additional include path
+-CCFLAGS=$(CCINC) $(CCOPTS)#
++#CCFLAGS=$(CCINC) $(CCOPTS)#
+ 			        # further flags forwarded to the C compiler
  
+-CXXINC=-I. -I.. -Irts/ -Ifi_lib#
++#CXXINC=-I. -I.. -Irts/ -Ifi_lib#
+                                 # additional include path
+-CXXFLAGS=$(CXXINC) $(CXXOPTS)#
++#CXXFLAGS=$(CXXINC) $(CXXOPTS)#
+                                 # further flags forwarded to the C++ compiler
+  
+ AR=ar#                   put object file into archive
+@@ -91,7 +90,7 @@
+ RM=rm -f#                remove files (forced)
+ RMDIR=rm -rf#            remove directory
+ 
+-INSTALL=install -m 644#  copy files
++INSTALL=${INSTALL_DATA}#  copy files
+ STRIP=strip -g#          strip executables from debug symbols
+ INSTDIR=install -d#      create installation directory
+ 
+@@ -110,8 +109,7 @@
+ BUILDTMP=/var/spool/pkg
+ TMPDIR=$(TOPDIR)/tmp
+ 
+-export PREFIX VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION TOPDIR CC CCOPTS  \
+-       CCOPTIMIZE CCINC CCFLAGS CXX CXXOPTS CXXOPTIMIZE CXXINC CXXFLAGS \
++export PREFIX VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION TOPDIR \
+        DEPENDOPT AR RANLIB LN RM RMDIR INSTALL STRIP INSTDIR ARCH \
+        CXSCRELEASE CXSCPATH RELEASE PKGNAME BUILDTMP TMPDIR LIBS COMPILER
+ #
diff -ruN cxsc-old/files/patch-src::Makefile cxsc/files/patch-src::Makefile
--- cxsc-old/files/patch-src::Makefile	Sat Aug 11 17:54:45 2001
+++ cxsc/files/patch-src::Makefile	Wed Jun  9 11:27:38 2004
@@ -1,6 +1,6 @@
---- src/Makefile.orig	Sat Aug 11 22:56:38 2001
-+++ src/Makefile	Sat Aug 11 23:04:30 2001
-@@ -72,11 +72,11 @@
+--- src/Makefile.orig	Wed Dec 17 19:09:21 2003
++++ src/Makefile	Wed Jun  9 11:24:56 2004
+@@ -146,11 +146,11 @@
  	$(INSTALL) ./libcxsc_inl.a $(PREFIX)/lib/
  #	$(STRIP) $(PREFIX)/lib/libcxsc_inl.a
  # install header files
diff -ruN cxsc-old/files/patch-src::rts::s_date.c cxsc/files/patch-src::rts::s_date.c
--- cxsc-old/files/patch-src::rts::s_date.c	Thu Jan  1 01:00:00 1970
+++ cxsc/files/patch-src::rts::s_date.c	Wed Jun  9 14:14:05 2004
@@ -0,0 +1,10 @@
+--- src/rts/s_date.c.orig	Wed Dec 10 09:03:38 2003
++++ src/rts/s_date.c	Wed Jun  9 14:12:07 2004
+@@ -56,7 +56,6 @@
+ #if SUN4_GNU_C
+ /* only defined when c++ flag defined in 2.5.8 */
+ /* extern long unsigned int strftime (char *, long unsigned int , const char *, const struct tm *); */
+-extern long time (long *);
+ #endif
+ #ifdef LINT_ARGS
+ local s_trng s_date(s_trng fmt)
diff -ruN cxsc-old/pkg-plist cxsc/pkg-plist
--- cxsc-old/pkg-plist	Sat Aug 11 17:54:45 2001
+++ cxsc/pkg-plist	Wed Jun  9 14:35:49 2004
@@ -79,6 +79,9 @@
 include/cxsc/ivecrmat.inl
 include/cxsc/ivector.hpp
 include/cxsc/ivector.inl
+include/cxsc/l_comple.hpp
+include/cxsc/l_comple.inl
+include/cxsc/l_complex.hpp
 include/cxsc/l_defs.h
 include/cxsc/l_fcth.h
 include/cxsc/l_imath.hpp
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406091258.i59CweNP012818>