diff options
| -rw-r--r-- | .SRCINFO | 33 | ||||
| -rw-r--r-- | Makefile_common.patch | 65 | ||||
| -rw-r--r-- | Makefile_install_ucb.patch | 43 | ||||
| -rw-r--r-- | Makefile_linux.patch | 36 | ||||
| -rw-r--r-- | PKGBUILD | 49 | ||||
| -rw-r--r-- | radware.csh | 9 | ||||
| -rw-r--r-- | radware.sh | 9 |
7 files changed, 140 insertions, 104 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Mon Sep 4 16:04:50 UTC 2017 pkgbase = radware pkgdesc = Software package for interactive graphical analysis of gamma-ray coincidence data pkgver = 05.3 - pkgrel = 4 + pkgrel = 5 url = http://radware.phy.ornl.gov/ install = radware.install arch = i686 @@ -15,19 +13,28 @@ pkgbase = radware depends = upak depends = xorg-fonts-75dpi depends = xorg-fonts-100dpi + depends = xorg-fonts-type1 + depends = xorg-fonts-misc + depends = xorg-font-util + depends = xorg-fonts-alias-75dpi + depends = xorg-fonts-alias-100dpi + depends = xorg-fonts-alias-misc + depends = xorg-fonts-encodings + depends = xorg-fonts-misc + depends = xorg-fonts-type1 + depends = xorg-mkfontscale options = !emptydirs - source = ftp://radware.phy.ornl.gov/pub/radware/unix/rw05.3.tgz - source = Makefile_linux.patch - source = Makefile_install_ucb.patch + source = git+https://github.com/radforddc/rw05.git source = Makefile_common.patch + source = Makefile_install_ucb.patch + source = Makefile_linux.patch source = radware.csh source = radware.sh - md5sums = d1d57e776d99d062e277041608503f1e - md5sums = 1681b27aae2d32be42f5a08b5417aa3e - md5sums = 3e327212567c98ee2b9673d87ec935ee - md5sums = 399db4e1a49b3f7051688d71272d02e0 - md5sums = ea98474aada4f5f597c084625fafbe76 - md5sums = b39293fc8f944638a340eb4a5ae4eda8 + md5sums = SKIP + md5sums = d1938cf6a67d8fb2e3c420935ec3816f + md5sums = e627dc4fc39af8649ffae3ce7037e094 + md5sums = 9bd1841b9f741bb45850d3de908c4606 + md5sums = ee654c4fedca3a09f90101263ffadb1a + md5sums = f81032b69ef924426cf346564787c6a7 pkgname = radware - diff --git a/Makefile_common.patch b/Makefile_common.patch index 85d9b2f3ed57..6474056462ef 100644 --- a/Makefile_common.patch +++ b/Makefile_common.patch @@ -1,20 +1,49 @@ ---- Makefile.common 2011-04-14 13:16:13.000000000 -0500 -+++ ../../../Makefile.common 2012-03-04 17:42:48.975097462 -0500 -@@ -2,7 +2,7 @@ - +--- src/rw05/src/Makefile.common 2022-11-04 15:38:59.174478050 +0000 ++++ Makefile.common 2022-11-02 14:35:03.406950368 +0000 +@@ -3,7 +3,7 @@ EXE = 4dg8r 4play addesc addmat algndiag calib_ascii combine divide \ - dixie_gls drawstring effit encal energy escl8r foldout gf3 gf3x gls \ -- gls_conv incub8r legft levit8r lufwhm make4cub pedit plot plot2ps \ -+ gls_conv incub8r legft levit8r lufwhm make4cub pedit plotrw plot2ps \ - pro3d pro4d pslice sdgen split4cub slice Source spec_ascii statft \ - subbgm2 subbgmat symmat unfold unfoldesc unix2unix vms2unix win2tab \ - gtkgls gtkesc gtklev gtk4dg \ -@@ -111,7 +111,7 @@ - pedit: pedit.o menu_x.o caskx.o getfloat.o drawstring.o util.a minig.a - $(CC) $(CFLAGS) -o $@ pedit.o menu_x.o caskx.o getfloat.o \ + dixie_gls drawstring effit encal energy escl8r foldout fwhm_cal \ + gf3 gf3_nographics gf3x gls gls_conv incub8r legft levit8r \ +- lufwhm make4cub pedit plot plot2ps sdgen split4cub slice Source \ ++ lufwhm make4cub pedit plotrw plot2ps sdgen split4cub slice Source \ + spec_ascii statft pro3d pro4d pslice subbgm2 subbgmat symmat \ + txt2spe unfold unfoldesc unix2unix vms2unix win2tab + # his2mat rdm rdmfit +@@ -120,7 +120,7 @@ + pedit: pedit.c menu_x.o caskx.o getfloat.o drawstring.o util.a minig.a + $(CC) $(CFLAGS) -o $@ pedit.c menu_x.o caskx.o getfloat.o \ drawstring.o util.a minig.a $(LIB_PATHS) $(LIBS) --plot: plot.o getfloat.o util.a -+plotrw: plot.o getfloat.o util.a - $(CC) $(CFLAGS) -o $@ plot.o getfloat.o util.a $(LIB_PATHS) $(LIBS) - plot2ps: plot2ps.o getfloat.o util.a drawstr_ps.o - $(CC) $(CFLAGS) -o $@ plot2ps.o getfloat.o util.a drawstr_ps.o $(LIB_PATHS) $(LIBS) +-plot: plot.c getfloat.o util.a ++plotrw: plot.c getfloat.o util.a + $(CC) $(CFLAGS) -o $@ plot.c getfloat.o util.a $(LIB_PATHS) $(LIBS) + plot2ps: plot2ps.c getfloat.o util.a drawstr_ps.o + $(CC) $(CFLAGS) -o $@ plot2ps.c getfloat.o util.a drawstr_ps.o $(LIB_PATHS) $(LIBS) +@@ -282,22 +282,21 @@ + # a r c h i v e s + ############################################################################### + +-gls.a: FORCE ++.PHONY: gls.a minig.a minig.a mingtk.a util.a .c.o ++gls.a: + cd libs/gls; $(MAKE) ../../gls.a ${SUB_MAKE_FLAGS} +-minig.a: FORCE ++minig.a: + cd libs/minig; $(MAKE) ../../minig.a ${SUB_MAKE_FLAGS} +-mingtk.a: FORCE ++mingtk.a: + cd libs/mingtk; $(MAKE) ../../mingtk.a ${SUB_MAKE_FLAGS} +-util.a: FORCE ++util.a: + cd libs/util; $(MAKE) ../../util.a ${SUB_MAKE_FLAGS} + +-.c.o: FORCE ++.c.o: + $(CC) $(CFLAGS) -c $*.c + + ############################################################################### + +-FORCE: +- + clean: + $(RM_CMD) + clean-exe: diff --git a/Makefile_install_ucb.patch b/Makefile_install_ucb.patch index 87c51a22a7f4..9568783f37e3 100644 --- a/Makefile_install_ucb.patch +++ b/Makefile_install_ucb.patch @@ -1,35 +1,12 @@ ---- Makefile.install_ucb 2002-03-15 14:01:20.000000000 -0500 -+++ ../../../Makefile.install_ucb 2012-03-04 11:31:03.312604316 -0500 -@@ -3,22 +3,22 @@ - - install-dir: - -mkdir -p $(INSTALL_DIR)/bin -- -mkdir -p $(INSTALL_DIR)/font -- -mkdir -p $(INSTALL_DIR)/icc -- -mkdir -p $(INSTALL_DIR)/demo -- -mkdir -p $(INSTALL_DIR)/doc -+ -mkdir -p $(INSTALL_DIR)/share/fonts/radware -+ -mkdir -p $(INSTALL_DIR)/share/radware/icc -+ -mkdir -p $(INSTALL_DIR)/share/radware/doc/demo -+ -mkdir -p $(INSTALL_DIR)/share/radware/doc - install-dat: install-dir - $(INSTALL) ./.radwarerc $(INSTALL_DIR)/.radwarerc - $(INSTALL) ./.radware.bashrc $(INSTALL_DIR)/.radware.bashrc -- $(INSTALL) ../font/font.dat $(INSTALL_DIR)/font/font.dat -- $(INSTALL) ../font/font_ps.dat $(INSTALL_DIR)/font/font_ps.dat -+ $(INSTALL) ../font/font.dat $(INSTALL_DIR)/share/fonts/radware/font.dat -+ $(INSTALL) ../font/font_ps.dat $(INSTALL_DIR)/share/fonts/radware/font_ps.dat - install-icc: install-dir -- $(INSTALL) ../icc/iccndx.dat $(INSTALL_DIR)/icc/iccndx.dat -- $(INSTALL) ../icc/icctbl.dat $(INSTALL_DIR)/icc/icctbl.dat -+ $(INSTALL) ../icc/iccndx.dat $(INSTALL_DIR)/share/radware/icc/iccndx.dat -+ $(INSTALL) ../icc/icctbl.dat $(INSTALL_DIR)/share/radware/icc/icctbl.dat - install-demo: install-dir -- $(INSTALL) ../demo/*.* $(INSTALL_DIR)/demo -+ $(INSTALL) ../demo/*.* $(INSTALL_DIR)/share/radware/doc/demo - install-doc: install-dir -- $(INSTALL) ../doc/*.* $(INSTALL_DIR)/doc -+ $(INSTALL) ../doc/*.* $(INSTALL_DIR)/share/radware/doc - install-bin: install-dir +--- src/rw05/src/Makefile.install_ucb 2022-11-04 15:38:59.174478050 +0000 ++++ Makefile.install_ucb 2022-11-04 15:18:43.891146852 +0000 +@@ -23,3 +23,9 @@ for program in $(EXE) ; \ do $(INSTALL_BIN) $$program $(INSTALL_DIR)/bin; \ + done ++ for program in $(GTK) ; \ ++ do $(INSTALL_BIN) $$program $(INSTALL_DIR)/bin; \ ++ done ++ for program in $(XM) ; \ ++ do $(INSTALL_BIN) $$program $(INSTALL_DIR)/bin; \ ++ done diff --git a/Makefile_linux.patch b/Makefile_linux.patch index 75fca9f9780e..1cce7c82c4f7 100644 --- a/Makefile_linux.patch +++ b/Makefile_linux.patch @@ -1,6 +1,6 @@ ---- Makefile.linux 2011-04-12 19:20:18.000000000 -0500 -+++ ../../../Makefile.linux 2012-03-05 23:28:28.843179977 -0500 -@@ -20,13 +20,13 @@ +--- src/rw05/src/Makefile.linux 2022-11-04 15:38:59.174478050 +0000 ++++ Makefile.linux 2022-11-04 15:33:51.449500008 +0000 +@@ -20,22 +20,22 @@ #------------------------------------------------------------------------ # CHANGE the next 3 lines to suit your installation preferences @@ -8,24 +8,42 @@ - INSTALL = /usr/bin/install -m 0644 -o radfordd -g users - INSTALL_BIN = /usr/bin/install -m 0755 -o radfordd -g users + INSTALL_DIR = ${DESTINATION_DIR} -+ INSTALL = /usr/bin/install -m 0644 -+ INSTALL_BIN = /usr/bin/install -m 0755 ++ INSTALL = /usr/bin/install -m 0644 -o `id -un` -g `id -gn` ++ INSTALL_BIN = /usr/bin/install -m 0755 -o `id -un` -g `id -gn` #------------------------------------------------------------------------ - CC = cc -+ CC = gcc -fPIC ++ CC = gcc FC = $(CC) - CFLAGS = -O2 -Wall -I$(MOTIF_TOP)/include -DHAVE_GNU_READLINE +- CFLAGS = -O2 -Wall -I$(MOTIF_TOP)/include -DHAVE_GNU_READLINE ++ CFLAGS = -march=native -O2 -Wall -DHAVE_GNU_READLINE -@@ -43,8 +43,8 @@ + RANLIB = ranlib + AR = ar rv + RM = -rm -f + RM_CMD = $(RM) *.o core* *[~%] *.trace + +- LIBS = -lX11 -lm -lreadline -lncurses ++ LIBS = -lX11 -lm -lreadline -lncurses -lgfortran + MOTIF_LIBS = -lXm -lMrm -lXt -lXext -lXp + STATIC_MOTIF = -lXm -lMrm -lXpm -lXt -lSM -lICE -lXext -lXp + +@@ -43,13 +43,13 @@ # UNCOMMENT and CHANGE (if necessary) the line defining HISLIBS # if you have orphlib.a on your system, and you want to be able to read .his files. # UNCOMMENT the line defining FC as gcc if orphlib was compiled using gcc -# HISLIBS = /usr/hhirf/orphlib.a -# FC = g77 -+ HISLIBS = /usr/lib/orphlib.a ++ HISLIBS = /usr/local/hhirf/orphlib.a + FC = gfortran #------------------------------------------------------------------------ +- LIB_PATHS = -L. -L$(X_WIN_TOP)/lib +- XM_LIB_PATHS = -L$(MOTIF_TOP)/lib ++ LIB_PATHS = /usr/local/hhirf/orphlib.a -L. ++ XM_LIB_PATHS = -L/usr/lib + GTK2 = TRUE + + SUB_MAKE_FLAGS = "CC = ${CC}" "CFLAGS = ${CFLAGS}" \ @@ -1,52 +1,55 @@ -# Submitter: Luis Sarmiento <lgsarmientop-ala-unal.edu.co> +# Maintainer: effeffe - Filippo Falezza <filippo dot falezza at outlook dot com> +# Contributor: Luis Sarmiento <lgsarmientop-ala-unal.edu.co> pkgname=radware _pkgname=rw pkgver=05.3 _pkgver=05 -pkgrel=4 +pkgrel=5 pkgdesc="Software package for interactive graphical analysis of gamma-ray coincidence data" url="http://radware.phy.ornl.gov/" arch=('i686' 'x86_64') license=('unknown') -depends=('openmotif' 'gtk2' 'upak' 'xorg-fonts-75dpi' 'xorg-fonts-100dpi') +depends=('openmotif' 'gtk2' 'upak' 'xorg-fonts-75dpi' 'xorg-fonts-100dpi' 'xorg-fonts-type1' + 'xorg-fonts-misc' 'xorg-font-util' 'xorg-fonts-alias-75dpi' 'xorg-fonts-alias-100dpi' + 'xorg-fonts-alias-misc' 'xorg-fonts-encodings' 'xorg-fonts-misc' 'xorg-fonts-type1' 'xorg-mkfontscale') makedepends=('gcc-fortran') install='radware.install' options=('!emptydirs') -source=("ftp://radware.phy.ornl.gov/pub/radware/unix/${_pkgname}${pkgver}.tgz" - 'Makefile_linux.patch' - 'Makefile_install_ucb.patch' - 'Makefile_common.patch' - 'radware.csh' - 'radware.sh') -md5sums=('d1d57e776d99d062e277041608503f1e' - '1681b27aae2d32be42f5a08b5417aa3e' - '3e327212567c98ee2b9673d87ec935ee' - '399db4e1a49b3f7051688d71272d02e0' - 'ea98474aada4f5f597c084625fafbe76' - 'b39293fc8f944638a340eb4a5ae4eda8') +source=( + 'git+https://github.com/radforddc/rw05.git' + 'Makefile_common.patch' + 'Makefile_install_ucb.patch' + 'Makefile_linux.patch' + 'radware.csh' + 'radware.sh') +md5sums=( + 'SKIP' + 'd1938cf6a67d8fb2e3c420935ec3816f' + 'e627dc4fc39af8649ffae3ce7037e094' + '9bd1841b9f741bb45850d3de908c4606' + 'ee654c4fedca3a09f90101263ffadb1a' + 'f81032b69ef924426cf346564787c6a7') prepare() { cd "${srcdir}/${_pkgname}${_pkgver}/src" - patch -Np3 < ${srcdir}/Makefile_linux.patch - cp Makefile.linux Makefile - - patch -Np3 < ${srcdir}/Makefile_install_ucb.patch patch -Np3 < ${srcdir}/Makefile_common.patch + patch -Np3 < ${srcdir}/Makefile_install_ucb.patch } build() { cd "${srcdir}/${_pkgname}${_pkgver}/src" - - make all + rm Makefile + cp Makefile.linux Makefile + make -j1 all gtk xm } package() { cd "${srcdir}/${_pkgname}${_pkgver}/src" - make DESTINATION_DIR="${pkgdir}/usr" install + make DESTINATION_DIR=${pkgdir}/opt/radware install install -m755 -d ${pkgdir}/etc/profile.d install -m755 ${srcdir}/radware.* ${pkgdir}/etc/profile.d/ - rm ${pkgdir}/usr/.radware* + rm ${pkgdir}/opt/radware/.radware* } diff --git a/radware.csh b/radware.csh index 841b28189a8b..084312c51af8 100644 --- a/radware.csh +++ b/radware.csh @@ -1,8 +1,9 @@ -setenv RADWARE_HOME /usr +setenv PATH $PATH\:/opt/radware/bin +setenv RADWARE_HOME /opt/radware # these variables point to directories containing various RadWare files -setenv RADWARE_FONT_LOC $RADWARE_HOME/share/fonts/radware -setenv RADWARE_ICC_LOC $RADWARE_HOME/share/radware/icc -setenv RADWARE_GFONLINE_LOC $RADWARE_HOME/share/doc/radware +setenv RADWARE_FONT_LOC $RADWARE_HOME/font +setenv RADWARE_ICC_LOC $RADWARE_HOME/icc +setenv RADWARE_GFONLINE_LOC $RADWARE_HOME/doc # this variable specifies whether to ring the bell in RadWare cursor routines setenv RADWARE_CURSOR_BELL y diff --git a/radware.sh b/radware.sh index c60c5dc62ea5..0c65cca60639 100644 --- a/radware.sh +++ b/radware.sh @@ -1,9 +1,10 @@ -export RADWARE_HOME=/usr +export PATH=$PATH:/opt/radware/bin +export RADWARE_HOME=/opt/radware # these variables point to directories containing various RadWare files - export RADWARE_FONT_LOC=$RADWARE_HOME/share/fonts/radware - export RADWARE_ICC_LOC=$RADWARE_HOME/share/radware/icc -export RADWARE_GFONLINE_LOC=$RADWARE_HOME/share/doc/radware +export RADWARE_FONT_LOC=$RADWARE_HOME/font +export RADWARE_ICC_LOC=$RADWARE_HOME/icc +export RADWARE_GFONLINE_LOC=$RADWARE_HOME/doc # this variable specifies whether to ring the bell in RadWare cursor routines export RADWARE_CURSOR_BELL=y |