Date: Mon, 21 Oct 2002 11:47:43 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/44354: Update port: science/oases Message-ID: <200210211847.g9LIlh3x005395@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 44354 >Category: ports >Synopsis: Update port: science/oases >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 21 11:50:13 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.7-RELEASE i386 >Organization: >Environment: >Description: - Support CC/CFLAGS/FC/FFLAGS/X11BASE properly >How-To-Repeat: >Fix: diff -urN /usr/ports/science/oases/Makefile science/oases/Makefile --- /usr/ports/science/oases/Makefile Thu Jun 27 13:26:58 2002 +++ science/oases/Makefile Tue Oct 22 01:31:02 2002 @@ -8,37 +8,50 @@ PORTNAME= oases PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= ftp://keel.mit.edu/pub/Oases/ DISTNAME= oases_Mar-28-2002 MAINTAINER= ports@FreeBSD.org -USE_XLIB= yes WRKSRC= ${WRKDIR}/Oases_export -OASES_ROOT= ${WRKSRC} +USE_XLIB= yes +USE_REINPLACE= yes +MAKE_ENV= OASES_ROOT="${WRKSRC}" + SCRIPT= avbeam bistat cplot mplot mtvplot multmtv oasn oasp oasr \ oass oassp oast plp2mtv EXAMPLE= mfp mfp_geo noise pulse rcoef rd_test rdloss rdpulse \ - scat scatp tloss + scat scatp tloss volume + +post-patch: + @${REINPLACE_CMD} -e 's|%%FC%%|${FC}|g ; \ + s|%%CC%%|${CC}|g ; \ + s|%%FFLAGS%%|${FFLAGS}|g ; \ + s|%%CFLAGS%%|${CFLAGS}|g ; \ + s|%%LDFLAGS%%|${LDFLAGS}|g ; \ + s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD-FreeBSD/* ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD-FreeBSD/* ${PREFIX}/bin .for script in ${SCRIPT} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/${script} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bin/${script} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD-FreeBSD/*.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/FreeBSD-FreeBSD/*.a ${PREFIX}/lib .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - @${CP} -R ${WRKSRC}/doc/ ${DOCSDIR} - @${MKDIR} ${EXAMPLESDIR} -.for example in ${EXAMPLE} - @${MKDIR} ${EXAMPLESDIR}/${example} - ${INSTALL_DATA} ${WRKSRC}/${example}/* ${EXAMPLESDIR}/${example} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${TAR} -C ${WRKSRC}/doc -cf - . | \ + ${TAR} -C ${DOCSDIR} --unlink -xf - + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + @${MKDIR} ${EXAMPLESDIR} +.for dir in ${EXAMPLE} + ${TAR} -C ${WRKSRC} -cf - ${dir} | \ + ${TAR} -C ${EXAMPLESDIR} --unlink -xf - .endfor - @${CP} -R ${WRKSRC}/volume ${EXAMPLESDIR} + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} .endif .include <bsd.port.mk> diff -urN /usr/ports/science/oases/files/patch-aa science/oases/files/patch-aa --- /usr/ports/science/oases/files/patch-aa Tue May 28 12:31:29 2002 +++ science/oases/files/patch-aa Mon Oct 21 22:29:55 2002 @@ -1,5 +1,5 @@ ---- Makefile Thu May 23 10:01:27 2002 -+++ Makefile Thu May 23 10:29:51 2002 +--- Makefile.orig Fri Jan 25 01:50:33 2002 ++++ Makefile Mon Oct 21 22:29:49 2002 @@ -4,6 +4,7 @@ # Written by: Henrik Schmidt # Modified by: Peter Daly @@ -13,40 +13,40 @@ # Binary and Library paths # -OASES_ROOT=${HOME}/Oases -+OASES_ROOT=${WRKDIRPREFIX}${.CURDIR} ++#OASES_ROOT=${HOME/Oases BIN = $(OASES_ROOT)/bin/${HOSTTYPE}-${OSTYPE} LIB = $(OASES_ROOT)/lib/${HOSTTYPE}-${OSTYPE} OBJ = ${HOSTTYPE}-${OSTYPE} -@@ -32,7 +33,7 @@ +@@ -109,6 +110,23 @@ + # + ############################################################################## # - FC.- = f77 - FFLAGS.- = -O --CFLAGS.- = -+CFLAGS.- = -I/usr/X11R6/include - LFLAGS.- = - RANLIB.- = ranlib - LIB_MISC.- = -@@ -105,6 +106,23 @@ - RANLIB.unknown-unknown = ranlib - LIB_MISC.unknown-unknown = - MISC.unknown-unknown = -+# -+############################################################################## -+# +# Intel x86 RUNNING FreeBSD 4.1 (or higher) +# +############################################################################## +# +# Compiler flags +# -+FC.FreeBSD-FreeBSD = f77 -+CC.FreeBSD-FreeBSD = cc -+FFLAGS.FreeBSD-FreeBSD = -O -+CFLAGS.FreeBSD-FreeBSD = -I/usr/X11R6/include -+LFLAGS.FreeBSD-FreeBSD = -L/usr/X11R6/lib ++FC.FreeBSD-FreeBSD = %%FC%% ++CC.FreeBSD-FreeBSD = %%CC%% ++FFLAGS.FreeBSD-FreeBSD = %%FFLAGS%% ++CFLAGS.FreeBSD-FreeBSD = %%CFLAGS%% -I%%X11BASE%%/include ++LFLAGS.FreeBSD-FreeBSD = %%LDFLAGS%% -L%%X11BASE%%/lib +RANLIB.FreeBSD-FreeBSD = ranlib +LIB_MISC.FreeBSD-FreeBSD = +MISC.FreeBSD-FreeBSD = ++# ++############################################################################## ++# + # DIGITAL MIPS-based WORKSTATIONS RUNNING ULTRIX 4.4 (or higher) # ############################################################################## +@@ -223,7 +241,7 @@ + # 'OSTYPE = ${OSTYPE}' 'HOSTTYPE = ${HOSTTYPE}' # + all: objdir oases.done mplot.done cplot.done pp.done \ +- mindis.done mail.send ++ mindis.done + rm -f *.done + + new: clean_mail clean objdir all diff -urN /usr/ports/science/oases/pkg-plist science/oases/pkg-plist --- /usr/ports/science/oases/pkg-plist Tue May 28 12:31:29 2002 +++ science/oases/pkg-plist Mon Oct 21 06:15:42 2002 @@ -67,8 +67,6 @@ %%PORTDOCS%%share/doc/oases/figs/vol_scat.ps %%PORTDOCS%%share/doc/oases/figs/wg_rhs.ps %%PORTDOCS%%share/doc/oases/figs/wg_scat.ps -%%PORTDOCS%%@dirrm share/doc/oases/figs -%%PORTDOCS%%@dirrm share/doc/oases %%PORTDOCS%%share/examples/oases/mfp/crack.dat %%PORTDOCS%%share/examples/oases/mfp/crackmfp.dat %%PORTDOCS%%share/examples/oases/mfp/f9-2.dat @@ -1058,18 +1056,20 @@ %%PORTDOCS%%share/examples/oases/volume/scenarios_vol/vol_c_iso4_scat.dat %%PORTDOCS%%share/examples/oases/volume/scenarios_vol/vol_c_iso6.dat %%PORTDOCS%%share/examples/oases/volume/scenarios_vol/vol_c_iso6_scat.dat -%%PORTDOCS%%@dirrm share/examples/oases/mfp -%%PORTDOCS%%@dirrm share/examples/oases/mfp_geo -%%PORTDOCS%%@dirrm share/examples/oases/noise -%%PORTDOCS%%@dirrm share/examples/oases/pulse -%%PORTDOCS%%@dirrm share/examples/oases/rcoef -%%PORTDOCS%%@dirrm share/examples/oases/rd_test -%%PORTDOCS%%@dirrm share/examples/oases/rdloss -%%PORTDOCS%%@dirrm share/examples/oases/rdpulse -%%PORTDOCS%%@dirrm share/examples/oases/scat -%%PORTDOCS%%@dirrm share/examples/oases/scatp -%%PORTDOCS%%@dirrm share/examples/oases/tloss -%%PORTDOCS%%@dirrm share/examples/oases/volume/scenarios_rgh %%PORTDOCS%%@dirrm share/examples/oases/volume/scenarios_vol +%%PORTDOCS%%@dirrm share/examples/oases/volume/scenarios_rgh %%PORTDOCS%%@dirrm share/examples/oases/volume +%%PORTDOCS%%@dirrm share/examples/oases/tloss +%%PORTDOCS%%@dirrm share/examples/oases/scatp +%%PORTDOCS%%@dirrm share/examples/oases/scat +%%PORTDOCS%%@dirrm share/examples/oases/rdpulse +%%PORTDOCS%%@dirrm share/examples/oases/rdloss +%%PORTDOCS%%@dirrm share/examples/oases/rd_test +%%PORTDOCS%%@dirrm share/examples/oases/rcoef +%%PORTDOCS%%@dirrm share/examples/oases/pulse +%%PORTDOCS%%@dirrm share/examples/oases/noise +%%PORTDOCS%%@dirrm share/examples/oases/mfp_geo +%%PORTDOCS%%@dirrm share/examples/oases/mfp %%PORTDOCS%%@dirrm share/examples/oases +%%PORTDOCS%%@dirrm share/doc/oases/figs +%%PORTDOCS%%@dirrm share/doc/oases >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210211847.g9LIlh3x005395>