aboutsummaryrefslogtreecommitdiff
path: root/science
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2009-01-26 17:52:53 +0000
committerThierry Thomas <thierry@FreeBSD.org>2009-01-26 17:52:53 +0000
commite8e613c2a6080dd5ccfd4b6e6c067a91eda21c48 (patch)
tree00eac19adc4cabb33c3b470e1255d494913c19b0 /science
parentfc5d806388a5c5aa6f8e55eb1e30df05e80b9cfb (diff)
downloadports-e8e613c2a6080dd5ccfd4b6e6c067a91eda21c48.tar.gz
ports-e8e613c2a6080dd5ccfd4b6e6c067a91eda21c48.zip
Notes
Diffstat (limited to 'science')
-rw-r--r--science/ncs/Makefile45
-rw-r--r--science/ncs/distinfo6
-rw-r--r--science/ncs/files/patch-bin_cs_profile56
-rw-r--r--science/ncs/files/patch-bin_macros_FreeBSD.mk111
-rw-r--r--science/ncs/pkg-descr2
-rw-r--r--science/ncs/pkg-plist22
6 files changed, 114 insertions, 128 deletions
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index 8c0d7da4b3f9..116bbacf7454 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= ncs
-PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTVERSION= 1.3.3
CATEGORIES= science parallel
MASTER_SITES= http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
@@ -20,6 +19,7 @@ LIB_DEPENDS= fvm.0:${PORTSDIR}/science/fvm
RUN_DEPENDS= xmgrace:${PORTSDIR}/math/grace \
ecs:${PORTSDIR}/science/ecs
+USE_GMAKE= yes
USE_GNOME= libxml2
USE_PYTHON= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -28,14 +28,9 @@ MAKE_ENV= NOM_ARCH=${OPSYS} CS_HOME=${WRKSRC} CS_MPI_PATH=${MPI_HOME}/bin \
PTHREAD_LIBS=${PTHREAD_LIBS} TERM=${TERM} \
MPI_HOME=${MPI_HOME} MPI_LIBS="${MPI_LIBS}"
-WANT_FORTRAN= yes #dummy but future use
-BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
-RUN_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
-FC= gfortran42
-F77= gfortran42
-FORTRANLIBDIR= `${DIRNAME} \\`gfortran42 -print-libgcc-file-name\\``
-FORTRANLIBDIR2= `${DIRNAME} \\`gfortran42 -print-libgcc-file-name\\``/../../../
-MAKE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
+USE_FORTRAN= yes #dummy but future use
+FORTRANLIBDIR= `${DIRNAME} \\`${FC} -print-libgcc-file-name\\``
+FORTRANLIBDIR2= `${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../../../
.if defined(PACKAGE_BUILDING)
TERM= vt100 # Force for pointyhat to override su
@@ -75,8 +70,8 @@ MPI_LIBS= -lmpich
.endif
.if !defined(NOPORTDOCS)
-# No PDF at the moment
-#BUILD_DEPENDS+= pdftex:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS+= pdftex:${PORTSDIR}/print/teTeX-base \
+ fig2dev:${PORTSDIR}/print/transfig
DOCS= AUTHORS COMPATIBILITY Changelog TODO
.endif
@@ -112,16 +107,12 @@ pre-patch:
${CP} -p ${WRKSRC}/bin/macros_Linux.mk ${WRKSRC}/bin/macros_FreeBSD.mk
do-configure:
- ${REINPLACE_CMD} -e 's|%%PATHCS%%|${PATHCS}|' \
- -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-e 's|%%FC%%|${FC}|' \
-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
-e 's|%%MPI_HOME%%|${MPI_HOME}|' \
-e 's|%%MPI_LIBS%%|${MPI_LIBS}|' \
${BUILD_WRKSRC}/cs_profile
- ${REINPLACE_CMD} \
- -e 's|/home/saturne/opt/python/arch/$${NOM_ARCH}/bin/python|${PYTHON_CMD}|' \
- ${BUILD_WRKSRC}/SaturneGUI
.if defined(WITH_ATLAS)
${REINPLACE_CMD} -e 's|BLAS =0|BLAS =1|' \
${BUILD_WRKSRC}/macros_FreeBSD.mk
@@ -131,6 +122,7 @@ do-configure:
-e 's|BLAS_INC =|BLAS_INC =-I${LOCALBASE}/include|' \
${BUILD_WRKSRC}/macros_FreeBSD.mk
.endif
+ ${REINPLACE_CMD} -e 's|make|${GMAKE}|g' ${BUILD_WRKSRC}/lance_install
do-build:
(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./lance_install)
@@ -141,9 +133,9 @@ do-build:
${GREP} -B 10 '^Stop in ') || ${TRUE}
.if !defined(NOPORTDOCS)
@${ECHO_MSG}
- #@${ECHO_MSG} "===> Building documentation."
+ @${ECHO_MSG} "===> Building documentation."
@${ECHO_MSG}
- #(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./lance_install DOC)
+ (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./lance_install DOC)
.endif
do-install:
@@ -166,16 +158,15 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/arch/${OPSYS}/bin/cs13.exe \
${CS_HOME}/arch/${OPSYS}/bin
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- #${MKDIR} ${DOCSDIR} ${CS_HOME}/doc/THEORY/ ${CS_HOME}/doc/USER/ \
+ ${MKDIR} ${DOCSDIR} ${CS_HOME}/doc/THEORY/ ${CS_HOME}/doc/USER/ \
${CS_HOME}/doc/TUTORIAL/
- #${INSTALL_DATA} ${WRKSRC}/doc/THEORY/theory.pdf ${CS_HOME}/doc/THEORY/
- #${INSTALL_DATA} ${WRKSRC}/doc/TUTORIAL/tutorial.pdf ${CS_HOME}/doc/TUTORIAL/
- #${INSTALL_DATA} ${WRKSRC}/doc/USER/user.pdf ${CS_HOME}/doc/USER/
- #${LN} -sf ${CS_HOME}/doc/THEORY/theory.pdf ${CS_HOME}/doc/TUTORIAL/tutorial.pdf \
- # ${CS_HOME}/doc/USER/user.pdf ${DOCSDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/doc/THEORY/theory.pdf ${CS_HOME}/doc/THEORY/
+ ${INSTALL_DATA} ${WRKSRC}/doc/TUTORIAL/tutorial.pdf ${CS_HOME}/doc/TUTORIAL/
+ ${INSTALL_DATA} ${WRKSRC}/doc/USER/user.pdf ${CS_HOME}/doc/USER/
+ ${LN} -sf ${CS_HOME}/doc/THEORY/theory.pdf ${CS_HOME}/doc/TUTORIAL/tutorial.pdf \
+ ${CS_HOME}/doc/USER/user.pdf ${DOCSDIR}/
${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
- #${LN} -sf ${LOCALBASE}/share/doc/ecs/ ${ECS_HOME}/doc
+ ${LN} -sf ${LOCALBASE}/share/doc/ecs/ ${ECS_HOME}/doc
.endif
post-install:
diff --git a/science/ncs/distinfo b/science/ncs/distinfo
index ad02cb201c65..e642d8d8cf29 100644
--- a/science/ncs/distinfo
+++ b/science/ncs/distinfo
@@ -1,3 +1,3 @@
-MD5 (ncs-132.tgz) = 1749ea12356ab251af5caf9f7e23351e
-SHA256 (ncs-132.tgz) = ad17b578418daba2c2c56fc23bd30895391165d15b09e11e5eaa0c8b4f133505
-SIZE (ncs-132.tgz) = 12038099
+MD5 (ncs-133.tgz) = 1267079f8079ca0fac6210205a9cb2a7
+SHA256 (ncs-133.tgz) = 7cec5ab535aca3eed8b8bb5e410a3f01db3ce40cfd3090a6727f7c048f8ee41f
+SIZE (ncs-133.tgz) = 12138504
diff --git a/science/ncs/files/patch-bin_cs_profile b/science/ncs/files/patch-bin_cs_profile
index 99a0e095730d..f23229a90dd9 100644
--- a/science/ncs/files/patch-bin_cs_profile
+++ b/science/ncs/files/patch-bin_cs_profile
@@ -1,34 +1,34 @@
---- bin/cs_profile.orig 2008-04-23 11:32:09.000000000 +0200
-+++ bin/cs_profile 2008-04-29 23:35:23.000000000 +0200
-@@ -37,12 +37,17 @@
-
- # Versions Code_saturne
-
-- PATHCS=/home/saturne
-+ PATHCS=%%LOCALBASE%%/Saturne
-+
-+ CS_HOME=${PATHCS}/Noyau/ncs
-+ ECS_HOME=${PATHCS}/Enveloppe/ecs
-+ CSGUI_HOME=${PATHCS}/Interface/ics
-+ SYRCS_HOME=${PATHCS}/opt/syr_cs
+--- bin/cs_profile.orig 2008-11-13 19:49:48.000000000 +0100
++++ bin/cs_profile 2009-01-25 10:23:09.000000000 +0100
+@@ -62,12 +62,16 @@
+ elif [ "$NOM_ARCH" = "Blue_Gene_P" ] ; then
+ CS_ROOT=/gpfs/home/saturne
+ else
+- CS_ROOT=/home/saturne
++ CS_ROOT=%%LOCALBASE%%/Saturne
+ fi
+- CS_HOME=${CS_ROOT}/Noyau/ncs-1.3.3
+- ECS_HOME=${CS_ROOT}/Enveloppe/ecs-1.3.3
+- CSGUI_HOME=${CS_ROOT}/Interface/ics-1.3.3
+- SYRCS_HOME=${CS_ROOT}/opt/syr_cs-2.1.1
++ CS_HOME=${CS_ROOT}/Noyau/ncs
++ ECS_HOME=${CS_ROOT}/Enveloppe/ecs
++ CSGUI_HOME=${CS_ROOT}/Interface/ics
++ SYRCS_HOME=${CS_ROOT}/opt/syr_cs
+# Variables specifiques a passer au Makefile FreeBSD par lance
+ LOCALBASE=%%LOCALBASE%% ; export LOCALBASE
+ FC=%%FC%% ; export FC
+ PTHREAD_LIBS=%%PTHREAD_LIBS%% ; export PTHREAD_LIBS
-
-- CS_HOME=${PATHCS}/Noyau/ncs-1.3.2
-- ECS_HOME=${PATHCS}/Enveloppe/ecs-1.3.2
-- CSGUI_HOME=${PATHCS}/Interface/ics-1.3.2
-- SYRCS_HOME=${PATHCS}/opt/syr_cs-2.0.2
#
- # Path
- PATH=$CS_HOME/bin:$ECS_HOME/bin:$PATH
-@@ -52,5 +57,7 @@
- export PATH
-
- # Chemins et librairies pour MPI
-- CS_MPI_PATH=/home/saturne/opt/openmpi-1.2.6/arch/Linux/bin
-+ MPI_HOME=%%MPI_HOME%% ; export MPI_HOME
-+ MPI_LIBS=%%MPI_LIBS%% ; export MPI_LIBS
-+ CS_MPI_PATH=${MPI_HOME}/bin
+ if [ "$NOM_ARCH" = "Linux" -a -d /home/prevalcs/HOMARD ] ; then
+ CSHOMARD_HOME=/home/prevalcs/HOMARD
+@@ -94,6 +98,8 @@
+ elif [ "$NOM_ARCH" = "Linux_Ch" ] ; then
+ CS_MPI_PATH=/usr/local/mpichgm-1.2.6.14b-64b/bin
+ else
+- CS_MPI_PATH=
++ MPI_HOME=%%MPI_HOME%% ; export MPI_HOME
++ MPI_LIBS=%%MPI_LIBS%% ; export MPI_LIBS
++ CS_MPI_PATH=${MPI_HOME}/bin
+ fi
export CS_MPI_PATH
diff --git a/science/ncs/files/patch-bin_macros_FreeBSD.mk b/science/ncs/files/patch-bin_macros_FreeBSD.mk
index c1e715046819..bd732de1f11a 100644
--- a/science/ncs/files/patch-bin_macros_FreeBSD.mk
+++ b/science/ncs/files/patch-bin_macros_FreeBSD.mk
@@ -1,5 +1,5 @@
---- bin/macros_FreeBSD.mk.orig 2008-04-23 11:32:13.000000000 +0200
-+++ bin/macros_FreeBSD.mk 2008-04-29 23:49:19.000000000 +0200
+--- bin/macros_FreeBSD.mk.orig 2008-11-05 18:48:56.000000000 +0100
++++ bin/macros_FreeBSD.mk 2009-01-25 10:37:09.000000000 +0100
@@ -1,3 +1,4 @@
+# $FreeBSD$
#============================================================================
@@ -9,24 +9,24 @@
#
#============================================================================
#
--# Macros du Makefile Code_Saturne pour Linux
--############################################
-+# Macros du Makefile Code_Saturne pour FreeBSD
-+##############################################
+-# Macros for Makefile under Linux x86
+-#####################################
++# Macros for Makefile under FreeBSD
++###################################
#
- # Macro pour BFT
+ # Macros for BFT
#---------------
--BFT_HOME =/home/saturne/opt/bft-1.0.6/arch/Linux
+-BFT_HOME =/home/saturne/opt/bft-1.0.8/arch/Linux
+BFT_HOME =${LOCALBASE}
BFT_INC =-I$(BFT_HOME)/include
BFT_LDFLAGS =-L$(BFT_HOME)/lib -lbft
@@ -43,7 +44,7 @@
- # Macro pour FVM
+ # Macros for FVM
#---------------
--FVM_HOME =/home/saturne/opt/fvm-0.10.0/arch/Linux
+-FVM_HOME =/home/saturne/opt/fvm-0.12.0/arch/Linux
+FVM_HOME =${LOCALBASE}
FVM_INC =-I$(FVM_HOME)/include
@@ -35,76 +35,73 @@
MPE =0
MPE_COMM =0
--# Pour Open MPI sur saturne
--MPI_HOME =/home/saturne/opt/openmpi-1.2.5/arch/Linux
--MPI_INC =-isystem$(MPI_HOME)/include
+-# For Open MPI on saturne
+-MPI_HOME =/home/saturne/opt/openmpi-1.2.6/arch/Linux
++# For MPI on saturne
+ MPI_INC =-I$(MPI_HOME)/include
-MPI_LIB =-pthread -L$(MPI_HOME)/lib -lmpi -lopen-rte -lopen-pal -ldl -Wl,--export-dynamic -lnsl -lutil -lm -ldl
-+# Pour MPI sur saturne
-+MPI_INC =-I$(MPI_HOME)/include
+MPI_LIB =-L$(MPI_HOME)/lib ${MPI_LIBS} $(PTHREAD_LIBS)
- # Macro pour Sockets
+ # Macros for Sockets
#-------------------
-@@ -75,7 +75,7 @@
- # Option XML
+@@ -75,20 +75,19 @@
+ # XML support
XML =1
--XML_HOME = /usr
+-XML_HOME =
+XML_HOME = ${LOCALBASE}
- XML_INC =-I$(XML_HOME)/include/libxml2
- XML_LIB =-L$(XML_HOME)/lib -lxml2
-@@ -84,11 +84,10 @@
+-XML_INC =-I/usr/include/libxml2
+-XML_LIB =-lxml2
++XML_INC =-I$(XML_HOME)/include/libxml2
++XML_LIB =-L$(XML_HOME)/lib -lxml2
+
+ # Macros for BLAS
#----------------
- # Option BLAS
+ # BLAS support
-BLAS =1
--BLAS_HOME =/home/saturne/opt/atlas-3.8.0/arch/Linux_P4E
--BLAS_INC =-I$(BLAS_HOME)/include
+-BLAS_HOME =
+-BLAS_INC =-I/usr/include
+BLAS =0
+BLAS_INC =
BLAS_CFLAGS =-D_CS_HAVE_CBLAS
--BLAS_LDFLAGS =-L$(BLAS_HOME)/lib -lcblas -latlas
+-BLAS_LDFLAGS =-lcblas -latlas
+BLAS_LDFLAGS =
+ # Macros for gettext
+ #-------------------
+@@ -110,19 +109,19 @@
+ # C compiler
+ #-----------
- # Preprocesseur
-@@ -101,35 +100,35 @@
- # Compilateur C
- #--------------
-
--CCOMP = /home/saturne/opt/gcc-4.2.3/arch/Linux/bin/gcc
+-CCOMP = /home/saturne/opt/gcc-4.3.1/arch/Linux/bin/gcc
+CCOMP = $(CC)
CCOMPFLAGSDEF = -std=c99 -funsigned-char -pedantic -W -Wall -Wshadow \
-Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings \
-Wstrict-prototypes -Wmissing-prototypes \
-- -Wmissing-declarations -Wnested-externs -Wno-uninitialized
-+ -Wmissing-declarations -Wnested-externs -Wno-uninitialized
+ -Wmissing-declarations -Wnested-externs -Wno-uninitialized
-CCOMPFLAGS = $(CCOMPFLAGSDEF) -O -Wno-unused
-CCOMPFLAGSOPTPART1 = $(CCOMPFLAGSDEF) -O2
-CCOMPFLAGSOPTPART2 = $(CCOMPFLAGSDEF) -O2
-CCOMPFLAGSOPTPART3 = $(CCOMPFLAGSDEF) -O0
--CCOMPFLAGSLO = $(CCOMPFLAGSDEF) -O0
--CCOMPFLAGSDBG = $(CCOMPFLAGSDEF) -g3
+CCOMPFLAGS = $(CCOMPFLAGSDEF) $(CFLAGS) -Wno-unused
+CCOMPFLAGSOPTPART1 = $(CCOMPFLAGSDEF) $(CFLAGS)
+CCOMPFLAGSOPTPART2 = $(CCOMPFLAGSDEF) $(CFLAGS)
+CCOMPFLAGSOPTPART3 = $(CCOMPFLAGSDEF) $(CFLAGS)
-+CCOMPFLAGSLO = $(CCOMPFLAGSDEF) -O0
+ CCOMPFLAGSLO = $(CCOMPFLAGSDEF) -O0
+-CCOMPFLAGSDBG = $(CCOMPFLAGSDEF) -g3
+CCOMPFLAGSDBG = $(CCOMPFLAGSDEF) -g
CCOMPFLAGSPROF = -pg
--CCOMPFLAGSVERS = -v
-+CCOMPFLAGSVERS = -v
+ CCOMPFLAGSVERS = -v
-
--# Compilateur FORTRAN
-+# Compilateur FORTRAN
- #--------------------
+@@ -131,14 +130,14 @@
+ #-----------------
# Profiling gprof : -pg -a
--FTNCOMP = /home/saturne/opt/gcc-4.2.3/arch/Linux/bin/gfortran
+-FTNCOMP = /home/saturne/opt/gcc-4.3.1/arch/Linux/bin/gfortran
+FTNCOMP = $(FC)
FTNCOMPFLAGSDEF = -I.
@@ -120,39 +117,37 @@
FTNCOMPFLAGSLO = $(FTNCOMPFLAGSDEF) -O0
FTNCOMPFLAGSDBG = $(FTNCOMPFLAGSDEF) -g
FTNCOMPFLAGSPROF = -pg
-@@ -142,13 +141,13 @@
-
+@@ -152,12 +151,12 @@
# Linker
--LDEDL = /home/saturne/opt/gcc-4.2.3/arch/Linux/bin/gfortran
+ LDEDL = $(FTNCOMP)
-LDEDLFLAGS = -O
-LDEDLFLAGSLO = -O0
-+LDEDL = $(FC)
+LDEDLFLAGS = $(LDFLAGS)
+LDEDLFLAGSLO = $(LDFLAGS)
LDEDLFLAGSDBG = -g
LDEDLFLAGSPROF = -pg
LDEDLFLAGSVERS = -v
--LDEDLRPATH = -rdynamic -Wl,-rpath -Wl,/home/saturne/opt/gcc-4.2.3/arch/Linux/lib:
-+LDEDLRPATH = -rdynamic -Wl,-rpath -Wl,
+-LDEDLRPATH = -rdynamic -Wl,-rpath -Wl,/home/saturne/opt/gcc-4.3.1/arch/Linux/lib:
++LDEDLRPATH = -rdynamic -Wl,-rpath -Wl,${LOCALBASE}/lib:
- # Positionnement des variables pour le pre-processeur
-@@ -164,7 +163,7 @@
+ # Set preprocessor variables
+@@ -172,7 +171,7 @@
- # Librairies de base toujours prises en compte
+ # Base libraries (always used)
-LIBBASIC = $(BFT_LDFLAGS) $(FVM_LDFLAGS) -lm -lpthread
+LIBBASIC = $(BFT_LDFLAGS) $(FVM_LDFLAGS) -lm $(PTHREAD_LIBS)
- # Librairies en mode sans option
+ # Libraries in production mode
-@@ -180,7 +179,7 @@
+@@ -188,7 +187,7 @@
- # Librairie en mode ElectricFence (malloc debugger)
+ # Library in ElectricFence (malloc debugger) mode
-LIBEF =-L/home/saturne/opt/efence-2.1.14/arch/Linux/lib -lefence
+LIBEF =-L${LOCALBASE}/lib -lefence
- # Liste eventuelle des fichiers a compiler avec des options particulieres
- #------------------------------------------------------------------------
+ # Optional lists of files to compile with specific options
+ #---------------------------------------------------------
diff --git a/science/ncs/pkg-descr b/science/ncs/pkg-descr
index c49d204ca46c..e0e25df25161 100644
--- a/science/ncs/pkg-descr
+++ b/science/ncs/pkg-descr
@@ -16,4 +16,4 @@ and may have structural non-conformities (hanging nodes).
NCS means "Noyau Code Saturne", i.e. "Code Saturne Kernel". This is the
numerical solver.
-WWW: http://rd.edf.com/code_saturne/
+WWW: http://www.code-saturne.org/
diff --git a/science/ncs/pkg-plist b/science/ncs/pkg-plist
index 60262f267eee..915c0d4ee2d0 100644
--- a/science/ncs/pkg-plist
+++ b/science/ncs/pkg-plist
@@ -1,5 +1,5 @@
%%ECS_HOME%%/bin/ecs
-@comment %%ECS_HOME%%/doc
+%%ECS_HOME%%/doc
%%CS_HOME%%/arch/FreeBSD/bin/cs13.exe
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneBASE.a
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneCFBL.a
@@ -63,9 +63,9 @@
%%CS_HOME%%/data/thch/dp_FCP
%%CS_HOME%%/data/thch/dp_FUE
%%CS_HOME%%/data/thch/dp_transfo
-@comment %%PORTDOCS%%%%CS_HOME%%/doc/THEORY/theory.pdf
-@comment %%PORTDOCS%%%%CS_HOME%%/doc/TUTORIAL/tutorial.pdf
-@comment %%PORTDOCS%%%%CS_HOME%%/doc/USER/user.pdf
+%%PORTDOCS%%%%CS_HOME%%/doc/THEORY/theory.pdf
+%%PORTDOCS%%%%CS_HOME%%/doc/TUTORIAL/tutorial.pdf
+%%PORTDOCS%%%%CS_HOME%%/doc/USER/user.pdf
%%CS_HOME%%/include/base/albase.h
%%CS_HOME%%/include/base/alstru.h
%%CS_HOME%%/include/base/cs_ale.h
@@ -650,9 +650,9 @@ lib/libsaturneRAYT.a
%%PORTDOCS%%%%DOCSDIR%%/COMPATIBILITY
%%PORTDOCS%%%%DOCSDIR%%/Changelog
%%PORTDOCS%%%%DOCSDIR%%/TODO
-@comment %%PORTDOCS%%%%DOCSDIR%%/theory.pdf
-@comment %%PORTDOCS%%%%DOCSDIR%%/tutorial.pdf
-@comment %%PORTDOCS%%%%DOCSDIR%%/user.pdf
+%%PORTDOCS%%%%DOCSDIR%%/theory.pdf
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.pdf
+%%PORTDOCS%%%%DOCSDIR%%/user.pdf
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%CS_HOME%%/users/rayt
@dirrm %%CS_HOME%%/users/pprt
@@ -686,10 +686,10 @@ lib/libsaturneRAYT.a
@dirrm %%CS_HOME%%/include/cfbl
@dirrm %%CS_HOME%%/include/base
@dirrm %%CS_HOME%%/include
-@comment %%PORTDOCS%%@dirrm %%CS_HOME%%/doc/USER
-@comment %%PORTDOCS%%@dirrm %%CS_HOME%%/doc/TUTORIAL
-@comment %%PORTDOCS%%@dirrm %%CS_HOME%%/doc/THEORY
-@comment %%PORTDOCS%%@dirrm %%CS_HOME%%/doc
+%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/USER
+%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/TUTORIAL
+%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/THEORY
+%%PORTDOCS%%@dirrm %%CS_HOME%%/doc
@dirrm %%CS_HOME%%/data/thch
@dirrm %%CS_HOME%%/data/mati
@dirrm %%CS_HOME%%/data