aboutsummaryrefslogtreecommitdiffstats
path: root/astro
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2021-04-08 01:54:12 +0800
committerRene Ladan <rene@FreeBSD.org>2021-04-08 01:54:26 +0800
commit5980fd40bc59f3f872f57f75b3a31fb986c1b06e (patch)
tree717e82c8a03179338de8d28a97e4fb040aa3ff6f /astro
parent99d4633e3859f15744ce6f3c8e365662aea16d63 (diff)
downloadfreebsd-ports-gnome-5980fd40bc59f3f872f57f75b3a31fb986c1b06e.tar.gz
freebsd-ports-gnome-5980fd40bc59f3f872f57f75b3a31fb986c1b06e.tar.zst
freebsd-ports-gnome-5980fd40bc59f3f872f57f75b3a31fb986c1b06e.zip
Remove expired ports:
2021-04-01 ftp/wzdftpd: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 astro/roadmap: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 games/cosmo: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 games/bomberinstinct: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 games/drm: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 games/bygfoot: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 games/cre: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 irc/hybserv: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 irc/xaric: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 mail/elmo: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 misc/cave: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 security/bugs: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 security/dmitry: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 security/doorman: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 shells/esh: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 sysutils/cpu: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 textproc/libcrm114: No known users, dead upstream 2021-04-01 x11/wmmatrix: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 x11/wmxss: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 x11/tycoon: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 x11/xgrab: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 x11/xbanner: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 x11/bricons: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 x11/xmon: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 games/cavezofphear: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 astro/saoimage: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 audio/ksmp3play: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 audio/jamin: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 audio/musicbox-tag-editor: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 audio/nspmod: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 audio/cdplay: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 audio/gimmix: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 audio/ghostess: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 audio/wmrecord: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 audio/toolame: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 audio/shout: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 biology/grappa: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 biology/phylip: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 biology/lagan: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 cad/varkon: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 cad/transcalc: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 comms/seyon: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 comms/efax: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 converters/vda2fbd: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 converters/shftool: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 devel/openzz: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 devel/sourcenav: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 devel/gb: Unmaintained and dead upstream 2021-04-01 dns/checkdns: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 dns/inadyn-mt: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 editors/gate: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 editors/thoteditor: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 emulators/cinc: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 emulators/e-uae: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 emulators/dtcyber: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 ftp/jftpgw: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-01 ftp/pureadmin: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) 2021-04-02 textproc/hs-pandoc-citeproc: Integrated into textproc/hs-pandoc
Diffstat (limited to 'astro')
-rw-r--r--astro/Makefile2
-rw-r--r--astro/roadmap/Makefile89
-rw-r--r--astro/roadmap/distinfo2
-rw-r--r--astro/roadmap/files/pkg-message.in18
-rw-r--r--astro/roadmap/pkg-descr16
-rw-r--r--astro/saoimage/Makefile34
-rw-r--r--astro/saoimage/distinfo2
-rw-r--r--astro/saoimage/files/patch-btnlib_makefile20
-rw-r--r--astro/saoimage/files/patch-disppsct.c11
-rw-r--r--astro/saoimage/files/patch-gcc42468
-rw-r--r--astro/saoimage/files/patch-makefile.FreeBSD68
-rw-r--r--astro/saoimage/files/patch-rgnwrite.c11
-rw-r--r--astro/saoimage/pkg-descr19
13 files changed, 0 insertions, 2760 deletions
diff --git a/astro/Makefile b/astro/Makefile
index 8dabd9006e16..b3691282726a 100644
--- a/astro/Makefile
+++ b/astro/Makefile
@@ -101,9 +101,7 @@
SUBDIR += qmapshack
SUBDIR += readosm
SUBDIR += rmap
- SUBDIR += roadmap
SUBDIR += routino
- SUBDIR += saoimage
SUBDIR += sextractor
SUBDIR += siril
SUBDIR += sofa
diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile
deleted file mode 100644
index 3a4284844dda..000000000000
--- a/astro/roadmap/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# Created by: Nick Esborn <nick@netdot.net>
-
-PORTNAME= roadmap
-PORTVERSION= 1.2.1
-PORTREVISION= 5
-CATEGORIES= astro geography
-MASTER_SITES= SF/${PORTNAME}/RoadMap/${PORTVERSION}
-DISTNAME= ${PORTNAME}-${PORTVERSION}-src
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Vector-based GPS moving map
-
-LICENSE= GPLv2+
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-LIB_DEPENDS= libexpat.so:textproc/expat2
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-BUILD_WRKSRC= ${WRKSRC}/src
-INSTALL_WRKSRC= ${WRKSRC}/src
-
-MAKE_JOBS_UNSAFE= yes
-
-USES= gmake gnome pkgconfig
-USE_GNOME= gtk20
-MAKE_ARGS= INSTALLDIR="${PREFIX}" CC="${CC}" CXX="${CXX}"
-
-CFLAGS+= -fcommon
-
-DEPRECATED= Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
-EXPIRATION_DATE=2021-04-01
-
-SUB_FILES= pkg-message
-
-PORTDOCS= ${DOCS} README
-PLIST_FILES= ${BINS:S,^,bin/,} ${GUI_BINS:S,^,bin/,} \
- ${GUI_BINS:S,^gtk,bin/,} ${SCRIPTS:S,^,bin/,} \
- man/man1/roadgps.1.gz man/man1/roadmap.1.gz \
- ${DATA:S,^,%%DATADIR%%/,}
-
-BINS= dumpmap buildmap buildmap_osm buildplace buildus
-GUI_BINS= gtkroadmap gtkroadgps
-SCRIPTS= rdmcompare rdmdownload rdmgendcwmaps rdmgenmaps \
- rdmgenshpmaps rdmgenstatemaps
-MANS= roadgps.1 roadmap.1
-DATA= drivers preferences roadmap.popup roadmap.screenobjects \
- session sprites
-DOCS= Bugs ChangeLog Coding Configuration Developer-Guide \
- Installation Map-Building Map-Designing Map-Format \
- OpenStreetMap Platforms Quickstart Status ToDo Usage
-
-OPTIONS_DEFINE= DOCS
-
-post-patch:
- @${REINPLACE_CMD} -e 's|-O ||g ; \
- s|/usr/include|${LOCALBASE}/include|g ; \
- s|/usr/local/include|${LOCALBASE}/include|g ; \
- s|/usr/local/lib|${LOCALBASE}/lib|g' ${WRKSRC}/src/options.mk
- @${ECHO_CMD} 'CFLAGS=${CFLAGS}' > ${WRKSRC}/src/overrides.mk
- @${ECHO_CMD} 'LDFLAGS=${LDFLAGS}' >> ${WRKSRC}/src/overrides.mk
- @${ECHO_CMD} 'LIBS=${LIBS}' >> ${WRKSRC}/src/overrides.mk
-
-do-install:
-.for _BIN in ${BINS}
- ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${_BIN} ${STAGEDIR}${PREFIX}/bin/${_BIN}
-.endfor
-.for _GUI_BIN in ${GUI_BINS}
- ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gtk2/${_GUI_BIN} ${STAGEDIR}${PREFIX}/bin/${_GUI_BIN}
- ${LN} -sf ${_GUI_BIN} ${STAGEDIR}${PREFIX}/bin/${_GUI_BIN:S,^gtk,,}
-.endfor
-.for _SCRIPT in ${SCRIPTS}
- ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${_SCRIPT} ${STAGEDIR}${PREFIX}/bin/${_SCRIPT}
-.endfor
-.for _MAN in ${MANS}
- ${INSTALL_MAN} ${INSTALL_WRKSRC}/${_MAN} ${STAGEDIR}${MANPREFIX}/man/man1/${_MAN}
-.endfor
- @${MKDIR} ${STAGEDIR}${DATADIR}
-.for _DATA in ${DATA}
- ${INSTALL_DATA} ${INSTALL_WRKSRC}/${_DATA} ${STAGEDIR}${DATADIR}/${_DATA}
-.endfor
-
-do-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
-.for _DOC in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/doc/${_DOC} ${STAGEDIR}${DOCSDIR}/${_DOC}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/astro/roadmap/distinfo b/astro/roadmap/distinfo
deleted file mode 100644
index 91666164c9b2..000000000000
--- a/astro/roadmap/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (roadmap-1.2.1-src.tar.gz) = b688efa61061fc35ce66c98b7ba7a5107087677d158a6cb329e43e4b70cd1625
-SIZE (roadmap-1.2.1-src.tar.gz) = 1303030
diff --git a/astro/roadmap/files/pkg-message.in b/astro/roadmap/files/pkg-message.in
deleted file mode 100644
index 64d6747d1892..000000000000
--- a/astro/roadmap/files/pkg-message.in
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-{ type: install
- message: <<EOM
-RoadMap is at an early stage of development, and is not thoroughly
-documented. It would be very unwise to rely on RoadMap for real
-navigation.
-
-The instructions for downloading and installing the necessary
-TIGER data are located in:
-
- %%DOCSDIR%%/README
-
-Make sure that you either have a program called flite (a voice
-synthesizer) or disable (mute) audio throught the menu. Other
-voice synthesizer can be used, like festival.
-EOM
-}
-]
diff --git a/astro/roadmap/pkg-descr b/astro/roadmap/pkg-descr
deleted file mode 100644
index 7045132157a2..000000000000
--- a/astro/roadmap/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-RoadMap is a program for Linux that displays street maps. The maps are
-provided by the US Census Bureau, and thus only cover the US.
-
-RoadMap is at an early stage of development. At this time there are no
-routing features implemented yet. RoadMap can only display the map around
-a specified street address or follow a GPS device (using gpsd). The plan
-for the future is to implement some navigation features similar to those
-found in commercial street navigation systems.
-
-RoadMap uses a binary file format for representing the maps that is compact
-enough to allow the storage of many maps on a Compact Flash or MultiMedia
-card. The map of Los Angeles county takes about 10 Mbytes of flash space.
-RoadMap comes with a set of tools to convert the US Census bureau data
-into its own map format.
-
-WWW: http://roadmap.sourceforge.net/
diff --git a/astro/saoimage/Makefile b/astro/saoimage/Makefile
deleted file mode 100644
index 924b61b61f24..000000000000
--- a/astro/saoimage/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Pedro Giffuni <giffunip@asme.org>
-
-PORTNAME= saoimage
-PORTVERSION= 1.35.1
-PORTREVISION= 3
-CATEGORIES= astro
-MASTER_SITES= http://tdc-www.harvard.edu/software/saoimage/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Smithsonian Astrophysical Observatory image utility for X
-
-MAKEFILE= makefile
-MAKE_ENV= OFLAGS="${CFLAGS}"
-ALL_TARGET= ${OPSYS}
-USES= xorg
-USE_XORG= x11
-
-CFLAGS+= -fcommon
-
-DEPRECATED= Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
-EXPIRATION_DATE=2021-04-01
-
-PLIST_FILES= bin/saoimage etc/imtoolrc.sample share/man/man1/saoimage.1.gz
-
-post-patch:
- # MFLAGS is reserved by make
- @${REINPLACE_CMD} -e 's|MFLAGS|MYMFLAGS|' ${WRKSRC}/makefile.FreeBSD
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/saoimage ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/imtoolrc ${STAGEDIR}${PREFIX}/etc/imtoolrc.sample
- ${INSTALL_MAN} ${WRKSRC}/doc/saoimage.man ${STAGEDIR}${PREFIX}/share/man/man1/saoimage.1
-
-.include <bsd.port.mk>
diff --git a/astro/saoimage/distinfo b/astro/saoimage/distinfo
deleted file mode 100644
index fda2523022ce..000000000000
--- a/astro/saoimage/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (saoimage-1.35.1.tar.gz) = 5e57f2c5a3932a03c6fe7cd8d0ebe5aba0e6806f587c77efcba0e4b7501a87da
-SIZE (saoimage-1.35.1.tar.gz) = 823479
diff --git a/astro/saoimage/files/patch-btnlib_makefile b/astro/saoimage/files/patch-btnlib_makefile
deleted file mode 100644
index d65f0aad01c0..000000000000
--- a/astro/saoimage/files/patch-btnlib_makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- btnlib/makefile.orig 1995-12-06 20:51:17 UTC
-+++ btnlib/makefile
-@@ -8,7 +8,7 @@
- # the library would build. It is preferable to build btnlib as part of the
- # make procedure in the parent SAOimage directory.
-
--CFLAGS = -c -O
-+CFLAGS += -c -I${LOCALBASE}/include
-
- LINT = lint
- RANLIB = ranlib
-@@ -27,7 +27,7 @@ OBJS = attach.o draw.o event.o border.
- press.o remote.o resize.o util.o
-
- LIB = libbtn.a
--XLIBH = /usr/include/X11/Xlib.h
-+XLIBH = ${LOCALBASE}/include/X11/Xlib.h
- #XLIBH = /usr/openwin/share/include/X11/Xlib.h #for OpenWindows
-
- all: $(LIB)
diff --git a/astro/saoimage/files/patch-disppsct.c b/astro/saoimage/files/patch-disppsct.c
deleted file mode 100644
index 0aa347de9877..000000000000
--- a/astro/saoimage/files/patch-disppsct.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- disppsct.c.orig 2003-09-03 18:23:08 UTC
-+++ disppsct.c
-@@ -599,7 +599,7 @@ static char *make_label()
- char *getenv();
- #endif
-
--#ifdef SUN
-+#if defined(SUN) && !defined(__FreeBSD__)
- long time(); /* should be in time.h, but not in SunOS */
- #endif
- long clock;
diff --git a/astro/saoimage/files/patch-gcc4 b/astro/saoimage/files/patch-gcc4
deleted file mode 100644
index 4483e5e976c3..000000000000
--- a/astro/saoimage/files/patch-gcc4
+++ /dev/null
@@ -1,2468 +0,0 @@
---- btnlib/border.c.orig 1995-05-04 17:21:13 UTC
-+++ btnlib/border.c
-@@ -35,6 +35,10 @@ static char SccsId[] = "%W% %G%";
- * Note: For each byte, bit 0 (0x01) appears on the left.
- * Note: For each byte, bit 7 (0x80) appears on the right.
- */
-+
-+static unsigned char btn_ReverseByte();
-+static void btn_MakeBdrLine();
-+
- void btn_MakeBdrBitmap ( buttonmap, width, height, byte_width, form, inverse )
- unsigned char *buttonmap; /* i,o: pointer to bitmap of button */
- int width, height; /* i: dimensions of button window (to cover) */
-@@ -52,8 +56,6 @@ void btn_MakeBdrBitmap ( buttonmap, widt
- int right_form_bit; /* l: bit in first right form byte to use */
- int right_bdr_byte; /* l: index of first line byte for right bdr */
- int right_bdr_bit; /* l: bit in first line byte for right bdr */
-- static unsigned char btn_ReverseByte();
-- static void btn_MakeBdrLine();
-
- /* portion of pattern form used (clip overlap if button very small) */
- /* middle overlap on odd size counted for height, omitted for width */
-@@ -119,6 +121,9 @@ void btn_MakeBdrBitmap ( buttonmap, widt
- * Subroutine: btn_MakeBdrLine
- * Purpose: set the bits for one line of the button's border
- */
-+
-+static void btn_RightBorder();
-+
- static void btn_MakeBdrLine ( line, form, byte_width, inverse,
- right_bdr_byte, right_bdr_bit,
- right_form_byte, right_form_bit )
-@@ -131,7 +136,6 @@ static void btn_MakeBdrLine ( line, form
- int right_bdr_byte; /* l: index of first line byte for right bdr */
- int right_bdr_bit; /* l: bit in first line byte for right bdr */
- {
-- static void btn_RightBorder();
- /* copy in top left, store reverse for top right */
- *line = *form;
- *(line+1) = *(++form);
---- btnlib/create.c.orig 1990-04-28 20:17:46 UTC
-+++ btnlib/create.c
-@@ -53,6 +53,9 @@ static GC def_gc = NULL;
- * Note: Buttonboxes must later be combined into menus and panels
- * Note: Call TouchButton to activate buttons and submenus when ready
- */
-+
-+static void btn_CreateWindows();
-+
- ButtonBox MakeButtonBox ( parent, gc, visual, background, geo, defs, borders )
- BoxParent *parent; /* i: Parent window info */
- GC gc; /* i: graphics context for drawing labels */
-@@ -70,7 +73,6 @@ ButtonBox MakeButtonBox ( parent, gc, vi
- int x, y; /* l: coordinates of box in parent */
- int i; /* l: loop counter */
- char *btn_Alloc();
-- static void btn_CreateWindows();
- void btn_LabelButtons(), btn_Dimensions();
-
- /* allocate the space for the new record */
---- btnlib/draw.c.orig 1991-06-21 23:40:21 UTC
-+++ btnlib/draw.c
-@@ -103,11 +103,13 @@ void btn_PutImage ( button, phase )
- * Xlib calls: none
- * Method: Dim this box and all co-menu boxes
- */
-+
-+static void btn_DimButtons();
-+
- void btn_DelightButtons ( buttonbox )
- ButtonBox buttonbox;
- {
- int i;
-- static void btn_DimButtons();
-
- btn_DimButtons(buttonbox);
- for( i=0; i < buttonbox->co_menu_count; i++ ) {
-@@ -153,11 +155,13 @@ static void btn_DimButtons ( buttonbox )
- * Uses: btn_LightButtons() below
- * Xlib calls: none
- */
-+
-+static void btn_LightButtons();
-+
- void btn_RelightButtons ( buttonbox )
- ButtonBox buttonbox;
- {
- int i;
-- static void btn_LightButtons();
-
- btn_LightButtons(buttonbox);
- for( i=0; i < buttonbox->co_menu_count; i++ ) {
---- btnlib/event.c.orig 1995-05-04 17:27:33 UTC
-+++ btnlib/event.c
-@@ -52,12 +52,14 @@ static int select_size=0;
- * with their active submenus.
- * Note: Must be called with a buttonbox at the base of the menu tree
- */
-+
-+static int btn_Event();
-+
- int ButtonEvent ( buttonbox, event )
- ButtonBox buttonbox; /* i: top handle for button menu group */
- XEvent *event; /* i: pointer to filled event record */
- {
- int i; /* l: loop counter */
-- static int btn_Event();
-
- /* is the event in the primary buttonbox (or its sub-menus) */
- if( btn_Event(buttonbox, event) != 0 ) {
-@@ -139,6 +141,10 @@ static int btn_Event ( buttonbox, event
- * with their active submenus.
- * Note: Must be called with a buttonbox at the base of the menu tree
- */
-+
-+static int btn_Event();
-+static int btn_Control();
-+
- int ButtonControl ( buttonbox, event, response )
- ButtonBox buttonbox; /* i: top handle for button menu group */
- XEvent *event; /* i: pointer to filled event record */
-@@ -147,8 +153,6 @@ int ButtonControl ( buttonbox, event, re
- int status; /* o: reason for return code (-1,0,1) */
- int not_found; /* l: event search status */
- int i; /* l: loop counter */
-- static int btn_Event();
-- static int btn_Control();
-
- status = 1;
- *response = NULL;
-@@ -206,6 +210,9 @@ int ButtonControl ( buttonbox, event, re
- * until one fields it. If still not, return NULL, else (it
- * was fielded) get the next event and loop again.
- */
-+
-+static int btn_Event();
-+
- static int btn_Control ( buttonbox, event, response )
- ButtonBox buttonbox; /* i: top handle for button menu tree */
- XEvent *event; /* i: pointer to filled event record */
-@@ -218,7 +225,6 @@ static int btn_Control ( buttonbox, even
- int type; /* l: temp for button response type */
- int id; /* l: temp for button id */
- int mask[2]; /* l: temp store for select mask (select changes it) */
-- static int btn_Event();
- int btn_PushButton();
- void btn_PutImage(), btn_DrawButton(), btn_ReleaseButton();
-
---- btnlib/image.c.orig 1991-08-03 22:42:11 UTC
-+++ btnlib/image.c
-@@ -38,6 +38,9 @@ static char SccsId[] = "%W% %G%";
- * Post-state: off_out, off_in, on_out, on_in XImage's set in button record.
- * Exception: Only labels present are installed.
- */
-+
-+static void btn_AddLabel();
-+
- void btn_MakeXImages ( button, width, height, byte_width, visual,
- off_out, off_in, on_out, on_in, mapsz, off, on, motf )
- ButtonRecord *button; /* i: main structure describing button */
-@@ -56,7 +59,6 @@ void btn_MakeXImages ( button, width, he
- unsigned char *data; /* l: pointer to bitmap currently processing */
- XImage *ximage;
- char *btn_Alloc();
-- static void btn_AddLabel();
-
- #ifdef ALLIANT
- extern int nbutton;
-@@ -173,6 +175,9 @@ void btn_MakeXImages ( button, width, he
- * Exception: Label is not stenciled if one dimension would be zero.
- * Method: Get basic alignment parameters and call btn_StencilLabel();
- */
-+
-+static int btn_LabelX(), btn_LabelY();
-+
- static void btn_AddLabel ( label, width, height, byte_width, bitmap, inverse )
- ButtonLabel *label; /* i: record of label bitmap to stencil in */
- int width; /* i: width in pixels of button */
-@@ -185,7 +190,6 @@ static void btn_AddLabel ( label, width,
- int dst_x, dst_y; /* l: coords of start of stencil in dst (button) */
- int xwdth; /* l: width (cols) to stencil */
- int yhght; /* l: number of lines (rows) to stencil */
-- static int btn_LabelX(), btn_LabelY();
- void btn_StencilLabel();
-
- if( ((xwdth = btn_LabelX(label, width, &src_x, &dst_x)) > 0) &&
---- btnlib/label.c.orig 1995-05-04 17:19:37 UTC
-+++ btnlib/label.c
-@@ -42,6 +42,10 @@ static unsigned char lmask[8] = { 0x01,0
- * Note: For each byte, bit 0 (0x01) appears on the left.
- * Note: For each byte, bit 7 (0x80) appears on the right.
- */
-+
-+static void btn_Stencil(), btn_StencilInv();
-+static void btn_StencilAlligned(),btn_StencilAllignedInv();
-+
- void btn_StencilLabel ( src, msk, dst, src_byte_width, dst_byte_width,
- src_x, src_y, dst_x, dst_y, width, height, inverse )
- unsigned char *src; /* i: ptr to first byte of pattern */
-@@ -66,9 +70,6 @@ void btn_StencilLabel ( src, msk, dst, s
- int first_mask; /* l: bit mask, with coded sign (see above) */
- int last_mask; /* l: bit mask, with coded sign (see above) */
-
-- static void btn_Stencil(), btn_StencilInv();
-- static void btn_StencilAlligned(),btn_StencilAllignedInv();
--
- /* advance src and msk to their first used bytes */
- byte_offset = (src_y * src_byte_width) + (src_x / 8);
- src += byte_offset;
---- btnlib/mount.c.orig 1990-04-20 21:56:27 UTC
-+++ btnlib/mount.c
-@@ -35,11 +35,13 @@ static char SccsId[] = "%W% %G%";
- * Xlib calls: none
- * Note: This routine moves latterally to cover co-menus
- */
-+
-+static void btn_MapButtonbox();
-+
- void MountButtonMenu ( buttonbox )
- ButtonBox buttonbox;
- {
- int i;
-- static void btn_MapButtonbox();
-
- btn_MapButtonbox(buttonbox);
- for( i = 0; i < buttonbox->co_menu_count; i++ )
-@@ -109,6 +111,9 @@ static void btn_UnmapButtonbox ( buttonb
- * map submenus of new button.
- * Note: Unmapping submenus is harmless if they were not mapped.
- */
-+
-+static void btn_UnmapButtonbox(), btn_MapButtonbox();
-+
- void btn_ReplaceSubmenus ( buttonbox, btn, op_num, mapping )
- ButtonBox buttonbox;
- int btn;
-@@ -116,7 +121,6 @@ void btn_ReplaceSubmenus ( buttonbox, bt
- int mapping; /* i: switch allows suppression of mapping */
- {
- int i;
-- static void btn_UnmapButtonbox(), btn_MapButtonbox();
-
- /* clear out the old submenus */
- for( i=0; i < buttonbox->submenu_count; i++ )
-@@ -149,6 +153,9 @@ void btn_ReplaceSubmenus ( buttonbox, bt
- * Note: Requires search through co-menus
- * Note: Unmapping cosubmenus is harmless if they were not mapped.
- */
-+
-+static void btn_UnmapButtonbox(), btn_MapButtonbox();
-+
- void btn_ReplaceCosubmenus ( buttonbox, btn, op_num, mapping )
- ButtonBox buttonbox;
- int btn;
-@@ -156,7 +163,6 @@ void btn_ReplaceCosubmenus ( buttonbox,
- int mapping; /* i: switch allows suppression of mapping */
- {
- int i, j;
-- static void btn_UnmapButtonbox(), btn_MapButtonbox();
-
- /* check to see if we have the co-mode submenus */
- if( buttonbox->cosubmenu_count > 0 ) {
---- btnlib/resize.c.orig 1990-04-20 22:15:57 UTC
-+++ btnlib/resize.c
-@@ -33,12 +33,14 @@ static char SccsId[] = "%W% %G%";
- * Post-state: All buttonboxes having given parent are resized to fill
- * Method: Call btn_ChkResize with this menu and then its co-menus.
- */
-+
-+static void btn_ChkResize();
-+
- void ResizeButtons ( buttonbox, parent )
- ButtonBox buttonbox; /* i: top handle for button menu group */
- BoxParent *parent; /* i: record describing parent window */
- {
- int i; /* l: loop counter */
-- static void btn_ChkResize();
-
- /* check this buttonbox */
- btn_ChkResize(buttonbox, parent);
---- clralloc.c.orig 1999-05-12 18:40:45 UTC
-+++ clralloc.c
-@@ -39,12 +39,14 @@ static unsigned long overlay_mask; /* fo
- * Method: Try for at least min cells in default colormap, if failed
- * try to create a private colormap.
- */
-+
-+static Colormap create_colormap();
-+static int alloc_color_cells();
-+
- int alloc_colors( color )
- struct colorRec *color;
- {
- int verify_pseudocolor();
-- static Colormap create_colormap();
-- static int alloc_color_cells();
-
- if( (color->map.default_permit != NO) &&
- (color->map.default_enable == YES) &&
---- clrctrl.c.orig 1990-04-20 14:43:37 UTC
-+++ clrctrl.c
-@@ -36,13 +36,15 @@ extern struct cgraphRec cgraph;
- * Subroutine: select_color
- * Purpose: Things to do when a buttonbox color menu button is selected
- */
-+
-+static void new_color_table();
-+
- void select_color ( )
- {
- static int overlay = 0;
- static int cells = 0;
- static int mode = VOP_PseudoColor;
- void invert_rgb(), reinit_color();
-- static void new_color_table();
-
- if( control.response[0] == VOP ) {
- switch( control.response[1] ) {
-@@ -218,10 +220,12 @@ static void new_color_table ( map_code )
- * Purpose: Reverse all colors at once (respond to invert button)
- * Xlib call: XStoreColors()
- */
-+
-+static void invert_table();
-+
- void invert_rgb ( )
- {
- void make_cellstore_from_cellmaps(), draw_cgraph();
-- static void invert_table();
-
- /* invert color tables and remake storemap */
- invert_table(&color.ctable.red);
---- clrhard.c.orig 1990-04-20 13:54:21 UTC
-+++ clrhard.c
-@@ -29,11 +29,13 @@ static char SccsId[] = "%W% %G%";
- * Subroutine: init_hard_colors
- * Purpose: Set up basic hardware colors
- */
-+
-+static int get_hard_color();
-+
- void init_hard_colors ( color, colormap )
- struct colorRec *color;
- Colormap colormap;
- {
-- static int get_hard_color();
-
- color->hard.red =
- get_hard_color(color->display, colormap, "red", 63000, 0, 0);
-@@ -58,12 +60,14 @@ void init_hard_colors ( color, colormap
- * Subroutine: lookup_cursor_colors
- * Purpose: Get color parameters from named cursor colors
- */
-+
-+static void lookup_color();
-+
- void lookup_cursor_colors ( color, colormap, init )
- struct colorRec *color;
- Colormap colormap;
- int init;
- {
-- static void lookup_color();
-
- /* update xcolor structs if needed */
- if( init || (color->cur.desired_cur != NULL) ) {
-@@ -90,12 +94,14 @@ void lookup_cursor_colors ( color, color
- * Pre-state: XColor for cur, one, and two, initialized
- * Post-state: Pixel values for one and two set, that for cur returned.
- */
-+
-+static int alloc_hard_color();
-+
- int alloc_cursor_cell_color ( color, colormap )
- struct colorRec *color;
- Colormap colormap;
- {
- int val;
-- static int alloc_hard_color();
-
- if( (color->cur.disp_one =
- alloc_hard_color(color->display, colormap, &color->cur.color_one)) < 0 )
-@@ -113,10 +119,12 @@ int alloc_cursor_cell_color ( color, col
- * Subroutine: free_cursor_cell_color
- * Purpose: Free cell color overlay colors
- */
-+
-+static void free_readonly_color();
-+
- void free_cursor_cell_color ( color )
- struct colorRec *color;
- {
-- static void free_readonly_color();
-
- free_readonly_color(color, (int)color->cur.color_one.pixel);
- free_readonly_color(color, (int)color->cur.color_two.pixel);
---- clrinit.c.orig 2001-12-14 23:17:55 UTC
-+++ clrinit.c
-@@ -38,6 +38,9 @@ static Display *display;
- * Subroutine: init_color
- * Purpose: Claim and set up colors (and do any needed initial work)
- */
-+
-+static int init_visual();
-+
- void init_color ( color, init )
- struct colorRec *color;
- int init;
-@@ -46,7 +49,6 @@ void init_color ( color, init )
- void exit_errmsg(), init_hard_colors(), init_halftone();
- void free_color_cells(), lookup_cursor_colors(), free_cursor_cell_color();
- void init_overlay_color(), init_cell_color(), init_halftone_color();
-- static int init_visual();
-
- if( init ) {
- display = color->display;
---- clrmenu.c.orig 1990-04-28 22:40:14 UTC
-+++ clrmenu.c
-@@ -35,14 +35,16 @@ EditStruct *color_edit; /* key to popup
- * Purpose: Get a new pre-defined color table and load it for use
- * Returns: 1 if succeeded, else 0
- */
-+
-+static void load_newtable(), write_color_file();
-+static ColorTable *read_color_file();
-+
- int fetch_colortable ( color, table_code, imagefile )
- struct colorRec *color;
- int table_code;
- char *imagefile; /* i: imagefile name to print in output file */
- {
- ColorTable *newtable;
-- static void load_newtable(), write_color_file();
-- static ColorTable *read_color_file();
-
- switch( table_code ) {
- case MOP_Init_A:
-@@ -111,13 +113,15 @@ static ColorTable *read_color_file ( )
- * Subroutine: write_color_file
- * Purpose: Open and write a color table file
- */
-+
-+static void print_one_color();
-+
- static void write_color_file ( imagefile, color )
- char *imagefile;
- struct colorRec *color;
- {
- FILE *fp;
- int error;
-- static void print_one_color();
- EditStruct *init_edit_popup();
- int open_output_file();
- void timestamp();
-@@ -189,11 +193,13 @@ static void print_one_color ( fp, table
- * Subroutine: load_newtable
- * Purpose: Load an internally stored color table for use
- */
-+
-+static void load_subtable();
-+
- static void load_newtable ( ctable, new )
- struct colorTable *ctable;
- ColorTable *new;
- {
-- static void load_subtable();
-
- load_subtable(&ctable->red, &new->red);
- load_subtable(&ctable->green, &new->green);
---- clrread.c.orig 1990-04-28 23:30:35 UTC
-+++ clrread.c
-@@ -25,6 +25,9 @@ static char SccsId[] = "%W% %G%";
- * Subroutine: parse_color_file
- * Purpose: Parse values after color identifier
- */
-+
-+static int parse_color_table(), advance_to_ascii();
-+
- int parse_color_file ( fp, ctable, max_entries )
- ColorTable *ctable;
- int max_entries;
-@@ -35,7 +38,6 @@ int parse_color_file ( fp, ctable, max_e
- char line[SZ_LINE];
- char cbuf[SZ_LINE];
- struct SubTable *table;
-- static int parse_color_table(), advance_to_ascii();
-
- line_num = 0;
- /* advance to first non-comment line */
-@@ -95,6 +97,9 @@ int parse_color_file ( fp, ctable, max_e
- * Purpose: Read color table entries for one color
- * Note: Values may start with word "gamma" and its value
- */
-+
-+static int advance_to_ascii(), prep_alpha();
-+
- static int parse_color_table ( fp, line, cbuf, i, len, line_num,
- farb, max_entries, color_cnt )
- FILE *fp;
-@@ -110,7 +115,6 @@ static int parse_color_table ( fp, line,
- float level, intensity;
- char *level_token, *intensity_token;
- int status, entry;
-- static int advance_to_ascii(), prep_alpha();
- int check_parens();
- char *next_token();
-
-@@ -227,6 +231,9 @@ static int parse_color_table ( fp, line,
- * Negative val if string starts with a number or paren
- * 0 if file ended, or first character was neither char nor num
- */
-+
-+static int find_token(), prep_alpha();
-+
- static int advance_to_ascii ( fp, line, scratch, len, line_num, dont_end )
- FILE *fp; /* i: file descriptor */
- char *line; /* i: buffer to get entire line */
-@@ -236,7 +243,6 @@ static int advance_to_ascii ( fp, line,
- int dont_end; /* flag that more is definitely expected */
- {
- int i;
-- static int find_token(), prep_alpha();
- int check_parens();
-
- /* advance to first non-comment line */
---- clrsetup.c.orig 1990-06-03 04:07:29 UTC
-+++ clrsetup.c
-@@ -29,12 +29,14 @@ static char SccsId[] = "%W% %G%";
- * Purpose: Set up color parameters unique to overlay type usage
- * Xlib calls: XStoreColors()
- */
-+
-+static void set_cursor_overlay_color(), copy_xcolor_rgb(), init_cellstore();
-+
- void init_overlay_color ( color )
- struct colorRec *color;
- {
- int ncolors;
- void make_cellstore_from_tables();
-- static void set_cursor_overlay_color(), copy_xcolor_rgb(), init_cellstore();
-
- init_cellstore(color->cellstore, color->pixvalmap, color->ncolors);
- /* color in the cursor range of the color map */
-@@ -75,12 +77,14 @@ void init_overlay_color ( color )
- * Purpose: Set up color parameters unique to cell usage without overlay
- * Xlib calls: XStoreColors()
- */
-+
-+static void init_cellstore();
-+
- void init_cell_color ( color )
- struct colorRec *color;
- {
- void make_cellstore_from_tables();
- int alloc_cursor_cell_color();
-- static void init_cellstore();
-
- init_cellstore(color->cellstore, color->pixvalmap, color->ncolors);
- /* Not cursor plane */
---- clrvary.c.orig 1990-04-20 13:57:20 UTC
-+++ clrvary.c
-@@ -130,6 +130,9 @@ void vary_colors ( event, mode, track, x
- * Subroutine: vary_contrast_and_bias
- * Purpose: change color table cell_levels as per new contrast and bias
- */
-+
-+static void invert_table();
-+
- void vary_contrast_and_bias ( table, contrast, bias )
- struct subtableRec *table;
- double contrast; /* i: normal = 1.0 */
-@@ -137,7 +140,6 @@ void vary_contrast_and_bias ( table, con
- {
- double *base_level, *cell_level;
- int vertex_cnt;
-- static void invert_table();
-
- base_level = table->base_level;
- cell_level = table->cell_level;
---- cmdnew.c.orig 1997-06-06 14:52:04 UTC
-+++ cmdnew.c
-@@ -73,9 +73,11 @@ static char *prompt = "Enter new image f
- * Called by: key_response() in MainKey.c
- * Called by: select_environment() in MainSelect.c
- */
-+
-+static int new_command();
-+
- void get_new_cmd ( )
- {
-- static int new_command();
- int get_edit_input();
- EditStruct *init_edit_popup();
-
-@@ -95,6 +97,11 @@ void get_new_cmd ( )
- * Purpose: Given a new command line, parse it and do what is called for
- * Returns: 1 = success, 0 = user decided not to do anything, -1 = error
- */
-+
-+static char **make_argv();
-+static int new_file(), form_tokens();
-+static void redo_displays(), clear_params(), reset_dispparams(), free_argv();
-+
- static int new_command ( input_line )
- char *input_line;
- {
-@@ -104,9 +111,6 @@ static int new_command ( input_line )
- int headersize;
- int parse_cmdline(), check_image();
- void reinit_color(), redraw_magnifier(), touch_submenu_button();
-- static char **make_argv();
-- static int new_file(), form_tokens();
-- static void redo_displays(), clear_params(), reset_dispparams(), free_argv();
-
- /* store some key initial values */
- headersize = img.headersize;
---- cmdparse.c.orig 2002-04-08 19:26:55 UTC
-+++ cmdparse.c
-@@ -47,6 +47,9 @@ extern int bad_buttons;
- * Purpose: Process options to set filename and change defaults
- * Returns: -1 on error, 0 OK but no filename, 1 OK and new filename given
- */
-+
-+static int parse_etc();
-+
- int parse_cmdline ( argc, argv, displayname )
- int argc;
- char *argv[];
-@@ -58,7 +61,6 @@ int parse_cmdline ( argc, argv, displayn
- int parse_rotate(), parse_scale(), parse_color(), parse_fileread(), usage();
- int parse_cursor();
- void init_cmdline();
-- static int parse_etc();
-
- if( displayname != NULL ) {
- /* if initial program command line, strip off program name, store line */
---- crdinvrt.c.orig 1990-04-20 14:00:26 UTC
-+++ crdinvrt.c
-@@ -28,12 +28,14 @@ static char SccsId[] = "%W% %G%";
- * Purpose: Compute parameters of the inverse transform
- * Method: Uses LU decomposition method
- */
-+
-+static void lu_decompose(), lu_backsub();
-+
- void invert_matrix ( old, new )
- Transform *old, *new;
- {
- float scratch[3][3], column[3];
- int pivots[3];
-- static void lu_decompose(), lu_backsub();
-
- scratch[0][0] = old->inx_outx;
- scratch[1][0] = old->iny_outx;
-@@ -65,13 +67,15 @@ void invert_matrix ( old, new )
- * Purpose: Compute the offsets used for integer transforms
- * Method: Uses matrix inversion
- */
-+
-+static void lu_decompose(), lu_backsub();
-+
- void compute_iadd_invert ( old, new, ioff )
- Transform *old, *new;
- float ioff;
- {
- float scratch[3][3], column[3];
- int pivots[3];
-- static void lu_decompose(), lu_backsub();
-
- /* set transform equations in matrix form */
- scratch[0][0] = old->inx_outx;
---- crdrot.c.orig 1990-04-20 14:00:51 UTC
-+++ crdrot.c
-@@ -55,6 +55,9 @@ static char SccsId[] = "%W% %G%";
- * As each transform is applied to the front, we apply them in reverse order
- * the result is, from img->A,B,C,imgtofile(as given)->file
- */
-+
-+static void move_mtrx(), flip_mtrx(), turn_mtrx();
-+
- void rotate_transform ( img, imgtofile, flip, rotcode )
- Coordsys *img;
- Transform *imgtofile;
-@@ -63,7 +66,6 @@ void rotate_transform ( img, imgtofile,
- {
- double xmove, ymove;
- int angle;
-- static void move_mtrx(), flip_mtrx(), turn_mtrx();
-
- /* if no rotation, do nothing */
- if( (rotcode == 0) && (flip == 0) ) return;
-@@ -93,6 +95,9 @@ void rotate_transform ( img, imgtofile,
- * Note: ioff is not used for turn or flip, as it is assumed that both
- * will be bracketed between two moves (to place origin at center)
- */
-+
-+static void mult_mtrx();
-+
- static void move_mtrx ( mtrx, xtran, ytran, ioff, prior )
- Transform *mtrx;
- double xtran, ytran;
-@@ -100,7 +105,6 @@ static void move_mtrx ( mtrx, xtran, ytr
- int prior;
- {
- Transform translate;
-- static void mult_mtrx();
-
- bzero((char *)(&translate), sizeof(Transform));
- translate.inx_outx = 1.0;
-@@ -119,12 +123,14 @@ static void move_mtrx ( mtrx, xtran, ytr
- * Subroutine: flip_mtrx
- * Purpose: Apply a mirror reflection to the passed Transform
- */
-+
-+static void mult_mtrx();
-+
- static void flip_mtrx ( mtrx, prior )
- Transform *mtrx;
- int prior; /* i: 1: move, transform, move, 0: transform, move */
- {
- Transform reflect;
-- static void mult_mtrx();
-
- bzero((char *)(&reflect), sizeof(Transform));
- reflect.inx_outx = 1.0;
-@@ -141,6 +147,9 @@ static void flip_mtrx ( mtrx, prior )
- * Note: the pivot is 0,0 of the passed Transform's coordinate system
- * Exception: only multiples of 90 degrees are allowed
- */
-+
-+static void mult_mtrx();
-+
- static void turn_mtrx ( mtrx, angle, prior )
- Transform *mtrx;
- int angle;
-@@ -148,7 +157,6 @@ static void turn_mtrx ( mtrx, angle, pri
- {
- Transform rotate;
- void exit_errmsg();
-- static void mult_mtrx();
-
- while( angle >= 360 ) angle -= 360;
- while( angle < 0 ) angle += 360;
---- crdsynth.c.orig 1990-04-20 14:01:55 UTC
-+++ crdsynth.c
-@@ -147,11 +147,13 @@ void combine_transform ( new, first, sec
- * Subroutine: set_trans_speed
- * Purpose: Set parameters for fast integer computation
- */
-+
-+static int integer_test();
-+
- void set_trans_speed ( trans )
- Transform *trans;
- {
- int xzm, yzm;
-- static int integer_test();
-
- trans->ixzoom = 0;
- trans->iyzoom = 0;
---- crdtemp.c.orig 1996-02-26 20:14:19 UTC
-+++ crdtemp.c
-@@ -126,6 +126,9 @@ void set_disptran ( coord )
- * Purpose: set up zoom given edges of desired display and
- * appropriate img transform
- */
-+
-+static int choose_zoom();
-+
- void panedge_zoom ( coord, wintoimgtrans, win_x, win_y )
- struct coordRec *coord; /* i: collected coords */
- Transform *wintoimgtrans; /* i: transform from mouse's window to img */
-@@ -134,7 +137,6 @@ void panedge_zoom ( coord, wintoimgtrans
- float imgX, imgY;
- int box_width, box_height;
- void i_transform();
-- static int choose_zoom();
-
- /* calculate image coordinates of win_x and win_y */
- i_transform(wintoimgtrans, win_x, win_y, &imgX, &imgY);
---- csrarea.c.orig 1990-04-20 14:07:03 UTC
-+++ csrarea.c
-@@ -28,13 +28,15 @@ static char SccsId[] = "%W% %G%";
- * Purpose: Calculate area, in float units file pixels, enclosed by cursor
- * Method: Use mathematical formula appropriate to cursor type
- */
-+
-+static int test_cross();
-+
- double cursor_area ( cursor, user_info )
- struct cursorRec *cursor;
- int user_info; /* flag, data is for user info */
- {
- double area;
- int i, j;
-- static int test_cross();
-
- switch( cursor->type ) {
- case COP_Circle:
-@@ -83,13 +85,15 @@ static double x11, y11, x12, y12;
- * are not tested since neighbors cannot cross but neighbors do
- * share a common point.
- */
-+
-+static int intercept();
-+
- static int test_cross ( pt, cnt, j, i )
- PolyPoint *pt; /* list of vertices */
- int cnt; /* number of vertices */
- int j, i; /* two vertices at ends of edge being tested */
- {
- int k;
-- static int intercept();
-
- if( (i+2) >= cnt ) {
- return( 0 );
---- csrgrab.c.orig 1990-04-20 14:08:42 UTC
-+++ csrgrab.c
-@@ -38,12 +38,14 @@ extern struct colorRec color; /* need to
- * Purpose: Change size of cursor to intersect current mouse cursor
- * while keeping aspect ratio of cursor constant
- */
-+
-+static void size_annulus(), grab_annulus();
-+
- void size_annuli ( cursor, event )
- struct cursorRec *cursor;
- XEvent *event; /* i: event for location of mouse */
- {
- void draw_cursor(), make_cursor();
-- static void size_annulus(), grab_annulus();
-
- /* if this event is initiating tracking, don't erase the cursor */
- if( event->type == MotionNotify )
-@@ -64,13 +66,15 @@ void size_annuli ( cursor, event )
- * Purpose: Respond to a mouse request to delete an annulus
- *
- */
-+
-+static int on_annulus();
-+static void size_annulus(), remove_annulus();
-+
- void delete_annulus ( cursor, event )
- struct cursorRec *cursor;
- XEvent *event; /* i: XMotionEvent or XButtonEvent */
- {
- struct cursorRec *parent;
-- static int on_annulus();
-- static void size_annulus(), remove_annulus();
-
- /* if there are two or more annuli */
- if( (cursor->next_annulus != 0) &&
-@@ -169,14 +173,16 @@ static void remove_annulus ( parent )
- * Purpose: Set up cursor to for a size annulus interaction
- * Called by: size_annuli()
- */
-+
-+static int on_annulus();
-+static void remove_annulus();
-+
- static void grab_annulus ( cursor )
- struct cursorRec *cursor;
- {
- double inc;
- int code;
- struct cursorRec *parent, *annulus;
-- static int on_annulus();
-- static void remove_annulus();
-
- code = on_annulus(cursor, &parent);
- /* decide what to draw */
---- csrpoly1.c.orig 1990-04-20 14:11:54 UTC
-+++ csrpoly1.c
-@@ -36,6 +36,9 @@ extern struct colorRec color; /* need to
- * Used when initiating a move or size action
- * Called by: control_cursor() in CursorCtrl.c
- */
-+
-+static int on_polygon_vertex();
-+
- void grab_polygon_vertex ( cursor, event, size )
- struct cursorRec *cursor;
- XEvent *event; /* i: XbuttonEvent (ButtonPress) for x & y */
-@@ -45,7 +48,6 @@ void grab_polygon_vertex ( cursor, event
- int pt; /* l: index of polygon vertex */
- int closest_polygon_line();
- void draw_cursor(), add_polygon_vertex();
-- static int on_polygon_vertex();
-
- /* erase existing cursor */
- draw_cursor(cursor, &color.gcset.undraw);
-@@ -84,13 +86,15 @@ void grab_polygon_vertex ( cursor, event
- * Returns: 1 if image must be redrawn, else 0
- * Called by: control_cursor() in CursorCtrl.c
- */
-+
-+static int on_polygon_vertex();
-+
- int request_delete_polygon_vertex ( cursor, event )
- struct cursorRec *cursor;
- XEvent *event; /* i: XbuttonEvent (ButtonPress) for x & y */
- {
- int i;
- void delete_polygon_vertex(), draw_cursor();
-- static int on_polygon_vertex();
-
- i = on_polygon_vertex((int)event->xbutton.x, (int)event->xbutton.y,
- cursor->points, cursor->poly_cnt);
---- csrpoly2.c.orig 1998-07-09 16:29:27 UTC
-+++ csrpoly2.c
-@@ -72,12 +72,14 @@ void collapse_polygon ( cursor )
- * Subroutine: start_polygon
- * Purpose: Install polygon drawing stuff for the active cursor
- */
-+
-+static void init_polygon();
-+
- void start_polygon ( cursor, coord )
- struct cursorRec *cursor;
- struct coordRec *coord;
- {
- void set_polygon_from_file_coords();
-- static void init_polygon();
-
- if( polysz == 0 )
- init_polygon();
---- csrpoly3.c.orig 1990-04-20 14:11:40 UTC
-+++ csrpoly3.c
-@@ -28,6 +28,9 @@ static char SccsId[] = "%W% %G%";
- * vector from pointer to closest point on segment
- * Method: top down search
- */
-+
-+static double distance_from_segment(), cos_to_segment();
-+
- int closest_polygon_line ( x, y, vertex, cnt )
- int x, y;
- XPoint *vertex;
-@@ -38,7 +41,6 @@ int closest_polygon_line ( x, y, vertex,
- int min_endpoint, endpoint;
- int min_j;
- int i, j;
-- static double distance_from_segment(), cos_to_segment();
-
- min_distance = 1.0E30;
- min_j = 0;
---- csrshape.c.orig 1998-10-19 18:46:41 UTC
-+++ csrshape.c
-@@ -31,9 +31,6 @@ static char SccsId[] = "%W% %G%";
-
- #include "defs/circle.def" /* Define Unit_circles */
-
--#ifdef ANSIC
--/* Exported declarations must be centralized before ANSI C can be used */
--
- void make_cursor( struct cursorRec *cursor);
- static int make_arrow( double xtip, double ytip, double xray,
- double rotsin, double rotcos, XPoint *points);
-@@ -41,28 +38,20 @@ static int make_boxcur( double xcen, dou
- double xray, double yray,
- double rotsin, double rotcos, XPoint *points);
- static int make_circur( double xcen, double ycen, double radius,
-- XPoint *points )
-+ XPoint *points );
- static int make_sqrcur( double xcen, double ycen, double radius,
-- XPoint *points )
-+ XPoint *points );
- static int make_diacur( double xcen, double ycen, double radius,
-- XPoint *points )
-+ XPoint *points );
- static int make_crosscur( double xcen, double ycen, double radius,
-- XPoint *points )
-+ XPoint *points );
- static int make_excur( double xcen, double ycen, double radius,
-- XPoint *points )
-+ XPoint *points );
- static int make_ellipse( double xcen, double ycen,
- double xradius, double yradius,
- double rotsin, double rotcos, XPoint *points);
- static int make_piecur( double xcen, double ycen, double radius,
-- XPoint *points )
--
--#else
--
-- static int make_arrow(), make_boxcur(), make_circur();
-- static int make_ellipse(), make_piecur();
--
--#endif
--
-+ XPoint *points );
-
- /* Declare and initialize drawing tools */
- double *UnitPieX = Circle12X;
---- ctrlcntn.c.orig 1998-07-09 16:29:00 UTC
-+++ ctrlcntn.c
-@@ -61,6 +61,9 @@ void init_connections ()
- * Purpose: Open a connection to a remote process and update event handlers
- * Returns: -1 on failure, else IPC number
- */
-+
-+static void init_select();
-+
- int open_connection ( connection )
- struct connectRec *connection;
- {
-@@ -71,7 +74,6 @@ int open_connection ( connection )
- extern int ButtonSelectMask(), open_pipe();
- extern int open_socket_listener();
- extern struct connectRec *accept_socket_connection();
-- static void init_select();
- #endif
-
- #ifdef NOPIPEFLUSH
---- ctrlfile.c.orig 1990-04-20 13:49:12 UTC
-+++ ctrlfile.c
-@@ -40,6 +40,9 @@ extern int errno;
- * Post state: Sets pointer to file, open and ready for writing
- * Returns: 2 = append, 1 = new file, 0 = user decided not to, -1 = error
- */
-+
-+static int file_exists();
-+
- int open_output_file ( fd, edit, one_popup_row, prompt )
- FILE **fd;
- EditStruct *edit;
-@@ -56,7 +59,6 @@ int open_output_file ( fd, edit, one_pop
- int get_edit_input();
- EditStruct *init_edit_popup();
- void clear_edit_buf(), unmap_popwin();
-- static int file_exists();
-
- open_type[0] = 0;
- if( (get_edit_input(edit, one_popup_row, 1, 0, prompt) <= 0) ||
-@@ -137,6 +139,9 @@ int open_output_file ( fd, edit, one_pop
- * Note: Sets pointer of file open and ready for reading
- * Returns: 1 on success, 0 if user decided not to, -1 on error
- */
-+
-+static int file_exists();
-+
- int open_input_file ( fd, edit, one_popup_row, prompt )
- FILE **fd;
- EditStruct *edit;
-@@ -146,7 +151,6 @@ int open_input_file ( fd, edit, one_popu
- char filename[132];
- int exist;
- int get_edit_input();
-- static int file_exists();
-
- if( get_edit_input(edit, one_popup_row, 1, 1, prompt) <= 0 )
- return( 0 );
---- ctrlgc.c.orig 1990-05-02 08:19:55 UTC
-+++ ctrlgc.c
-@@ -237,10 +237,12 @@ GC set_edit_gc ( font, foreground, backg
- * Subroutine: get_fontstruct
- * Returns: Pointer to the specified fontstruct
- */
-+
-+static int init_font();
-+
- XFontStruct *get_fontstruct ( app_code )
- int app_code; /* i: see comments above */
- {
-- static int init_font();
-
- if( (app_font[app_code] == NULL) && (init_font(app_code) == NULL) )
- return( NULL );
-@@ -253,11 +255,13 @@ XFontStruct *get_fontstruct ( app_code )
- * Purpose: Load the fonts used by this program
- * Returns: Font on success, else 0
- */
-+
-+static int open_font();
-+
- static int init_font ( app_code )
- int app_code; /* i: font application type index */
- {
- int i, name_index;
-- static int open_font();
-
- for( i=0; i<OPTION_COUNT; i++ ) {
- name_index = preference[app_code][i];
---- dispblnk.c.orig 1990-04-20 14:23:14 UTC
-+++ dispblnk.c
-@@ -181,13 +181,15 @@ static int display_blink ( index )
- * For each button release, if it is on top of stack, release it and display
- * one below, else just release it
- */
-+
-+static int display_blink();
-+
- void control_blink ()
- {
- static int oldmode;
- static int buttons = 0;
- static int btnstack[4];
- int i;
-- static int display_blink();
-
- if( control.event.type == ButtonPress ) {
- /* don't respond if it's with a meta key (window resize) */
---- dispbtmp.c.orig 1991-06-21 22:58:15 UTC
-+++ dispbtmp.c
-@@ -55,9 +55,11 @@ void init_halftone ()
- * Subroutine: select_halftone
- * Purpose: Respond to halftone selection command
- */
-+
-+static void new_halftone();
-+
- void select_halftone ()
- {
-- static void new_halftone();
-
- switch( control.response[1] ) {
- case 0:
---- editctrl.c.orig 1990-06-03 04:07:48 UTC
-+++ editctrl.c
-@@ -61,6 +61,9 @@ extern int XZ_efn;
- * Subroutine: init_edit_popup
- * Purpose: Get everything ready for running editor sessions
- */
-+
-+static void init_popwin();
-+
- EditStruct *init_edit_popup ( string, max_chars )
- char *string;
- int max_chars;
-@@ -69,7 +72,6 @@ EditStruct *init_edit_popup ( string, ma
- int len;
- EditStruct *get_edit_struct();
- void init_edit_struct(), load_edit_struct();
-- static void init_popwin();
-
- if( init_window ) {
- init_popwin(color.gcset.menu.foreground, color.gcset.menu.background);
-@@ -91,6 +93,9 @@ EditStruct *init_edit_popup ( string, ma
- * (but expose is fielded and configure is saved for end).
- * Returns: 1 if user returns with a response, 0 if user cancels session
- */
-+
-+static void map_popwin();
-+
- int get_edit_input ( edit, one_row, map, unmap, prompt )
- EditStruct *edit;
- int one_row; /* i: put-edit-after-prompt-on-same-line */
-@@ -104,7 +109,6 @@ int get_edit_input ( edit, one_row, map,
- int emacs_response();
- void draw_new_string(), redraw_edit_string();
- void adjust_desktop(), redraw_window(), unmap_popwin();
-- static void map_popwin();
-
- map_popwin(edit, one_row, prompt, map);
- if( !map ) {
---- grphbtmp.c.orig 1990-04-20 14:31:04 UTC
-+++ grphbtmp.c
-@@ -27,6 +27,9 @@ extern struct colorRec color;
- * Subroutine: make_halftone_panimage
- * Purpose: Make halftone bitmap for pan window (panbox)
- */
-+
-+static void byte_dither_sample(), byte_diffuse_sample();
-+
- void make_halftone_colorbar ( bytedata, bitdata,
- width, height, bytes_per_line )
- unsigned char *bytedata;
-@@ -34,7 +37,6 @@ void make_halftone_colorbar ( bytedata,
- int width, height;
- int bytes_per_line;
- {
-- static void byte_dither_sample(), byte_diffuse_sample();
-
- bzero((char *)bitdata, bytes_per_line * height);
- if( color.halftone.mode == BOP_Dither ) {
---- grphgrab.c.orig 1990-04-20 14:33:27 UTC
-+++ grphgrab.c
-@@ -30,10 +30,12 @@ extern struct cgraphRec cgraph;
- * Subroutine: grab_cgraph_vertex
- * Purpose: When a mouse button is pressed, assign a vertex to that button
- */
-+
-+static void get_color_vertex();
-+
- void get_cgraph_vertex ( event )
- XEvent *event;
- {
-- static void get_color_vertex();
-
- switch( event->xbutton.button ) {
- case Button1:
-@@ -58,10 +60,12 @@ void get_cgraph_vertex ( event )
- * event
- * Returns: 1 if a vertex was dropped, else 0
- */
-+
-+static int drop_color_vertex();
-+
- int drop_cgraph_vertex ( event )
- XEvent *event;
- {
-- static int drop_color_vertex();
-
- switch( event->xbutton.button ) {
- case Button1:
-@@ -83,13 +87,15 @@ int drop_cgraph_vertex ( event )
- * Purpose: Handle grab vertex event for single color
- * Method: Grab old vertex or make new vertex - under mouse pointer
- */
-+
-+static int grab_old_color_vertex();
-+static void install_new_color_vertex();
-+
- static void get_color_vertex ( x, y, col )
- int x, y;
- struct colgRec *col;
- {
- void install_draw_queue_end();
-- static int grab_old_color_vertex();
-- static void install_new_color_vertex();
-
- /* clip against limits */
- if( x < cgraph.graph.xzero )
-@@ -151,6 +157,9 @@ static int grab_old_color_vertex ( x, y,
- * Subroutine: install_new_color_vertex
- * Purpose: Given hash position, install a new vertex, and make active
- */
-+
-+static void add_color_vertex(), add_color_vertex_hash();
-+
- static void install_new_color_vertex ( x, y, col )
- int x, y; /* i: position of ULcorner of new hash mark */
- struct colgRec *col; /* i: color info structure for one color */
-@@ -158,7 +167,6 @@ static void install_new_color_vertex ( x
- double intensity, cell_level;
- int match;
- int select_best_hash_position();
-- static void add_color_vertex(), add_color_vertex_hash();
-
- col->active_hash = select_best_hash_position(x, y, col->hash, col->hash_cnt,
- &match, cgraph.vertical);
-@@ -251,11 +259,13 @@ static void add_color_vertex_hash ( col,
- * Purpose: Delete a color table vertex if one is under the mouse position
- * Returns: 1 if vertex was dropped, else 0
- */
-+
-+ static int grab_old_color_vertex();
-+
- static int drop_color_vertex ( col, x, y )
- struct colgRec *col;
- int x, y;
- {
-- static int grab_old_color_vertex();
-
- /* hash mark positions are upper left corner of hash box */
- x -= HASH_RAY;
---- grphinit.c.orig 1990-04-20 14:40:44 UTC
-+++ grphinit.c
-@@ -46,9 +46,11 @@ extern int XZ_efn;
- * Subroutine: init_colorbox
- * Purpose: Handle program init-time color bar and graph initialization
- */
-+
-+static void init_main_colorbar();
-+
- void init_colorbox ( )
- {
-- static void init_main_colorbar();
-
- cgraph.ncolors = color.ncolors;
- cgraph.red.table = &color.ctable.red;
-@@ -68,10 +70,12 @@ void init_colorbox ( )
- * Purpose: Initialize color bar and related params
- * Xlib calls: XCreateSimpleWindow(), XMapSubwindows()
- */
-+
-+static void set_colorbar_image(), set_colorbar_params();
-+
- static void init_main_colorbar ( )
- {
- char *calloc_errchk();
-- static void set_colorbar_image(), set_colorbar_params();
-
- colorbar.display = colorbox.display;
- colorbar.ref_width = colorbox.width;
-@@ -92,10 +96,12 @@ static void init_main_colorbar ( )
- * Subroutine: adjust_main_colorbar
- * Purpose: Adjust color bar size params and/or color data if needed
- */
-+
-+static void set_colorbar_image(), set_colorbar_params();
-+
- void adjust_main_colorbar ( )
- {
- char *calloc_errchk();
-- static void set_colorbar_image(), set_colorbar_params();
-
- if( (colorbox.width != colorbar.ref_width) ||
- (colorbox.height != colorbar.ref_height) ) {
-@@ -113,11 +119,13 @@ void adjust_main_colorbar ( )
- * Purpose: Initialize color bar and related params
- * Xlib calls: XMapSubwindows()
- */
-+
-+static void set_colorbar_image(), set_colorbar_params();
-+
- void init_graph_colorbar ( )
- {
- Window create_cgraph_box();
- char *calloc_errchk();
-- static void set_colorbar_image(), set_colorbar_params();
-
- cgraph.bar.display = graphbox.display;
- cgraph.bar.ref_width = graphbox.width;
-@@ -149,11 +157,13 @@ void init_graph_colorbar ( )
- * Subroutine: adjust_graph_colorbar
- * Purpose: Adjust color bar size params and/or color data if needed
- */
-+
-+static void set_colorbar_image(), set_colorbar_params();
-+
- void adjust_graph_colorbar ( )
- {
- int resize = 0;
- char *calloc_errchk();
-- static void set_colorbar_image(), set_colorbar_params();
-
- if( cgraph.vertical ) {
- if( graphbox.height != cgraph.bar.ref_height ) {
---- grphmove.c.orig 1990-04-20 14:37:26 UTC
-+++ grphmove.c
-@@ -26,12 +26,14 @@ extern struct cgraphRec cgraph;
- * Purpose: Change values (and position) of designated vertices in
- * response to mouse movement
- */
-+
-+static void move_color_vertex();
-+
- void move_cgraph_vertices ( x, y )
- int x, y;
- {
- double cell_level, intensity;
- int hash_x, hash_y;
-- static void move_color_vertex();
-
- /* clip against limits */
- if( x < cgraph.graph.xzero )
---- grpholap.c.orig 1990-04-20 14:36:00 UTC
-+++ grpholap.c
-@@ -28,13 +28,15 @@ extern struct cgraphRec cgraph;
- * Subroutine: mark_colorline_overlap
- * Purpose: Make line representing more than one color black (or white)
- */
-+
-+static void mark_hashmark_overlap();
-+
- void mark_colorline_overlap ( )
- {
- int i, j;
- int x, y;
- int x1, y1;
- XSegment line[256];
-- static void mark_hashmark_overlap();
-
- j = 0;
- if( cgraph.vertical ) {
---- grphtext.c.orig 1990-04-20 14:39:37 UTC
-+++ grphtext.c
-@@ -33,6 +33,9 @@ extern struct cgraphRec cgraph;
- * Purpose: Set labeling pieces according to the graph window size
- * Xlib calls: XMoveWindow(), XResizeWindow(), XMapWindow()
- */
-+
-+static void init_colorbar_label();
-+
- void init_color_graph_label ( )
- {
- int new = 0;
-@@ -40,7 +43,6 @@ void init_color_graph_label ( )
- int resize = 0;
- Window create_cgraph_box();
- void init_color_graph_label();
-- static void init_colorbar_label();
-
- if( cgraph.graphlabel.active == 0 )
- return;
---- histdist.c.orig 1998-07-28 18:56:45 UTC
-+++ histdist.c
-@@ -24,6 +24,9 @@ static char SccsId[] = "%W% %G%";
- * Purpose: Distribute the levels among histogram sub-groups
- * Returns: number of groups with no assigned color levels
- */
-+
-+static int excess_zgroup(), excess_nzgroup(), range_zgroup();
-+
- int distribute_levels ( linklist, pixel_area, color_levels,
- pmin, pmax, ncolor )
- SubrangeLink *linklist;
-@@ -39,7 +42,6 @@ int distribute_levels ( linklist, pixel_
- #ifdef DEBUG
- int census = 0;
- #endif
-- static int excess_zgroup(), excess_nzgroup(), range_zgroup();
-
- /* if all one group (no strong peaks), allocation is simple */
- if( linklist->next == 0 ) {
---- histeql.c.orig 1990-04-20 14:59:27 UTC
-+++ histeql.c
-@@ -24,6 +24,10 @@ static char SccsId[] = "%W% %G%";
- * output level optimization accounts for large cell counts
- * for single levels (e.g. half of all pixels with value 0)
- */
-+
-+static int count_nonzero_histogram_entries(), rescan_histogram();
-+static void unmark_peak_links();
-+
- void histogram_equalize ( scalemap, histogram, area, pmin, pmax,
- color_levels, pixels )
- unsigned char *scalemap; /* i/o: scalemap (for signed indexing) */
-@@ -42,8 +46,6 @@ void histogram_equalize ( scalemap, hist
- char *calloc_errchk();
- int distribute_levels();
- void generate_scalemap(), scan_histogram_for_peaks(), resolve_zeroes();
-- static int count_nonzero_histogram_entries(), rescan_histogram();
-- static void unmark_peak_links();
-
- /* initialize link list */
- linklist = (SubrangeLink *)calloc_errchk(10, sizeof(int), "HElink");
---- histlist.c.orig 1991-06-21 22:58:44 UTC
-+++ histlist.c
-@@ -29,6 +29,12 @@ static char SccsId[] = "%W% %G%";
- * Subroutine: make_equalized_list
- * Purpose: Distributing levels for a subrange section of the histogram
- */
-+
-+static int equalize_simply();
-+#ifdef JIGGLE
-+static void adjust_list();
-+#endif
-+
- void make_equalized_list ( histogram, list, low_entry, high_entry,
- pixel_area, color_levels )
- int *histogram;
-@@ -47,10 +53,6 @@ void make_equalized_list ( histogram, li
- int best_levels_under;
- int best_average_over = 0; /* average_area used to get best_levels */
- int best_average_under = 0;
-- static int equalize_simply();
--#ifdef JIGGLE
-- static void adjust_list();
--#endif
-
- /* else allocation distribution must first be determined */
- /* run through histgram section making basic allocation and taking notes */
---- histmap.c.orig 1990-04-20 15:00:13 UTC
-+++ histmap.c
-@@ -28,6 +28,9 @@ static char SccsId[] = "%W% %G%";
- * safely be applied.
- * Note: The original link-list of groups is freed.
- */
-+
-+static void make_subrange_scalemap();
-+
- void generate_scalemap ( hist, subrange, scalemap, pixels )
- int *hist; /* i: histogram (for signed offsets) */
- SubrangeLink *subrange; /* i: linklist of subranges */
-@@ -36,7 +39,6 @@ void generate_scalemap ( hist, subrange,
- {
- int baselevel;
- SubrangeLink *trash;
-- static void make_subrange_scalemap();
-
- baselevel = 0;
- while( subrange != 0 ) {
-@@ -54,6 +56,9 @@ void generate_scalemap ( hist, subrange,
- * Purpose: Make a section of scale map using histgroup link as guide
- * Called by: make_HE_scalemap() in HistEqual.c
- */
-+
-+static void make_gapped_list(), list_to_map();
-+
- static void
- make_subrange_scalemap ( histogram, subrange, scalemap, baselevel, pixels )
- int *histogram;
-@@ -67,7 +72,6 @@ static void
- unsigned char dispval;
- char *calloc_errchk();
- void make_equalized_list();
-- static void make_gapped_list(), list_to_map();
-
- /* if only one level, make map section */
- if( subrange->color_levels <= 1 ) {
-@@ -135,6 +139,10 @@ static void list_to_map ( scalemap, hist
- * Purpose: Allocate levels for a histogram subrange. Special process
- * for situation when more levels than actually used values.
- */
-+
-+static int first_shortlist_pass();
-+static void add_level_to_short_list();
-+
- static void make_gapped_list ( histogram, list, low, high, levels )
- int *histogram;
- SubrangeList *list;
-@@ -142,8 +150,6 @@ static void make_gapped_list ( histogram
- {
- int range_j, max_range;
- int levels_used;
-- static int first_shortlist_pass();
-- static void add_level_to_short_list();
-
- levels_used =
- first_shortlist_pass(histogram, list, low, high, levels,
---- histscan.c.orig 1990-04-20 15:00:36 UTC
-+++ histscan.c
-@@ -21,6 +21,10 @@ static char SccsId[] = "%W% %G%";
- * Purpose: Scan the image histogram picking out large cell count values
- * make sub-groups of the histogram between the large count levels
- */
-+
-+static SubrangeLink *get_new_subrange_record();
-+static void fill_subrange_record();
-+
- void scan_histogram_for_peaks ( subrange, histogram,
- pixel_area, map_levels, average )
- SubrangeLink *subrange; /* i/o: link (initially covers range) */
-@@ -36,8 +40,6 @@ void scan_histogram_for_peaks ( subrange
- int sr_nzentries; /* l: number of non-zero entries in subrange */
- int sr_pixel_area; /* l: number of pixels in current subrange */
- int sr_max_peak; /* l: highest peak within current subrange */
-- static SubrangeLink *get_new_subrange_record();
-- static void fill_subrange_record();
-
- /* set initial pixel_count values */
- sr_pixel_area = 0;
---- histzero.c.orig 1990-04-20 15:01:03 UTC
-+++ histzero.c
-@@ -23,13 +23,15 @@ static char SccsId[] = "%W% %G%";
- * Note: Adjoining groups are large count single level groups
- * Called by: histrogram_equalize() above
- */
-+
-+static void merge_links();
-+
- void resolve_zeroes ( PriorLink, zeroes )
- SubrangeLink *PriorLink;
- int zeroes;
- {
- SubrangeLink *ThisLink, *NextLink;
- int a_count, b_count, z1count, z2count;
-- static void merge_links();
-
- /* if very first entry is a zero allocated link */
- if( PriorLink->color_levels == 0 ) {
---- imgcheck.c.orig 2001-03-12 21:31:30 UTC
-+++ imgcheck.c
-@@ -46,13 +46,15 @@ static char SccsId[] = "%W% %G%";
- * Purpose: Do some consistency checks on image type and size
- * Returns: 0 if no errors found, else -1
- */
-+
-+static int check_array();
-+
- int check_image ( img, got_status )
- struct imageRec *img;
- int got_status;
- {
- int len;
- char *ext, *mwcs, cext;
-- static int check_array();
- extern int isfits();
-
- ext = NULL;
-@@ -148,6 +150,9 @@ int check_image ( img, got_status )
- * Purpose: Check array size vs file size etc
- * Returns: 0 if size determined and/or OK, else -1
- */
-+
-+static long size_imagefile();
-+
- static int check_array ( img )
- struct imageRec *img;
- {
-@@ -156,7 +161,6 @@ static int check_array ( img )
- float posdim; /* possible dimension */
- int headersize; /* size in bytes of header */
- int rawsize;
-- static long size_imagefile();
-
- /* get header size */
- headersize = img->headersize;
---- imglogo.c.orig 1990-04-26 16:31:48 UTC
-+++ imglogo.c
-@@ -372,13 +372,15 @@ static unsigned char logo[LOGO_SZ] = {
- * Subroutine: load_logo
- * Purpose: place logo image in image buffer
- */
-+
-+static void make_logo();
-+
- void load_logo ( shortbuf, bufwd, bufht )
- short *shortbuf;
- int bufwd, bufht;
- {
- register short *bufpt, *bufend;
- register short bkgd;
-- static void make_logo();
-
- /* fill buffer with background color */
- bufpt = shortbuf;
---- imgnew.c.orig 1998-10-14 23:01:58 UTC
-+++ imgnew.c
-@@ -52,6 +52,9 @@ extern struct windowRec desktop;
- * Purpose: Create all image coordinate parameters from the beginning
- * and take care of all that might be affected
- */
-+
-+static void load_mainbuf();
-+
- void new_display ( dispnow, clear, load, scale )
- int dispnow; /* i: put-display-in-window-now flag */
- int clear; /* i: clear img buf before reading flag */
-@@ -61,7 +64,6 @@ void new_display ( dispnow, clear, load,
- void set_disptran(), new_pancursor(), new_scalemap();
- void combine_transform(), set_edges(), set_dispoff(), set_magnifier();
- void adjust_cursor_coords(), map_dispbox(), disp_dispbox();
-- static void load_mainbuf();
-
- /* Set disp to img and disp to file transforms */
- set_disptran(&coord);
---- imgtrans.c.orig 1990-04-20 15:13:46 UTC
-+++ imgtrans.c
-@@ -26,6 +26,9 @@ static char SccsId[] = "%W% %G%";
- * 4-7 = flip y axis then rotate clockwise by (code - 4) * 90 degrees
- * Called by: load_image() in ImageRead.c
- */
-+
-+static void square_buf(), unsquare_buf();
-+
- void rotate_buf ( buf, flip, rotcode, width, height, buf_squared, buf_doubled )
- short *buf;
- int flip;
-@@ -36,7 +39,6 @@ void rotate_buf ( buf, flip, rotcode, wi
- int maxdim;
- void xflip_buf(), yflip_buf(), zflip_buf(), cwturn_buf(), ccwturn_buf();
- void transfer_buf();
-- static void square_buf(), unsquare_buf();
-
- if( flip )
- rotcode += 4;
---- irafcrd.c.orig 1990-04-20 15:16:02 UTC
-+++ irafcrd.c
-@@ -45,13 +45,15 @@ static char SccsId[] = "%W% %G%";
- * If found and parsed, compute new transform for file coord.
- * Returns: 1 if subsection found and parsed successfully, else 0
- */
-+
-+static int parse_iraf_subsection();
-+
- int guess_true_file_coords ( title )
- char *title;
- {
- int xoff, yoff, block;
- float fblock;
- Transform imgtoaux;
-- static int parse_iraf_subsection();
- void set_trans_speed(), combine_transform(), clear_coord_area();
-
- if( parse_iraf_subsection(title, &xoff, &yoff, &block) == 0 ) {
-@@ -92,6 +94,10 @@ int guess_true_file_coords ( title )
- * Purpose: Parse for subsection and blocking from the image name
- * Returns: 1 if subsection or blocking was used, else 0
- */
-+
-+static char *fn_substr(); /* look for a substr */
-+static void get_subsection_offsets();
-+
- static int parse_iraf_subsection ( s, xoff, yoff, block )
- char *s; /* i: file name */
- int *xoff; /* o: x offset */
-@@ -99,8 +105,6 @@ static int parse_iraf_subsection ( s, xo
- int *block; /* o: block */
- {
- char *t, *u; /* temp char pointers */
-- static char *fn_substr(); /* look for a substr */
-- static void get_subsection_offsets();
-
- /* seed the default values */
- *xoff = 1;
-@@ -139,6 +143,9 @@ static int parse_iraf_subsection ( s, xo
- * Subroutine: get_subsection_offsets
- * Purpose: parse subsection syntax for x and y offsets of subsection
- */
-+
-+static char *fn_substr();
-+
- static void get_subsection_offsets ( s, xoff, yoff, is_qp )
- char *s;
- int *xoff, *yoff;
-@@ -147,7 +154,6 @@ static void get_subsection_offsets ( s,
- int x1, x2;
- int y1, y2;
- char *sy, *s2, *st;
-- static char *fn_substr();
-
- /* if not qp, grab the initial x offset right after the '[' */
- sy = fn_substr(s, ",");
---- irafimtl.c.orig 1998-02-25 19:52:37 UTC
-+++ irafimtl.c
-@@ -46,6 +46,9 @@ static char wcsbuf[SZ_WCSBUF];
- * Subroutine: imtool_response
- * Purpose: Read imtool messages from iraf (return 1 if pipe trouble)
- */
-+
-+static int get_frame_no();
-+
- void imtool_response ( port, imhead, ndatabytes )
- struct connectRec *port; /* i: struct of port for IRAF input */
- struct imtoolRec *imhead; /* i: packet header, already read in */
-@@ -60,7 +63,6 @@ void imtool_response ( port, imhead, nda
- void set_curpos_to_iraf_trigger(), set_cursor_from_iraf(), imtool_output();
- void set_imtool_scale(), set_cursor_to_iraf(), disp_subpiece();
- void map_panbox(), disp_panbox(), send_curpos_to_iraf(), flush_connection();
-- static int get_frame_no();
-
- switch( imhead->subunit & 077 ) {
- case FEEDBACK:
-@@ -189,6 +191,9 @@ void imtool_response ( port, imhead, nda
- * Purpose: Reset buffer sizes, coordinate systems and parameters as
- * needed.
- */
-+
-+static int get_frame_no();
-+
- void imtool_newimage ( is_wcs, imhead )
- int is_wcs;
- struct imtoolRec *imhead;
-@@ -199,7 +204,6 @@ void imtool_newimage ( is_wcs, imhead )
- void set_disptran(), combine_transform(), set_edges(), set_dispoff();
- void adjust_cursor_coords(), set_magnifier(), disp_subpiece(), set_tdisp();
- void set_imtool_scale(), imtool_reinit(), new_pancursor();
-- static int get_frame_no();
-
- /* set size and frame */
- if( is_wcs )
---- irafio.c.orig 1992-10-12 17:17:50 UTC
-+++ irafio.c
-@@ -102,6 +102,9 @@ void rename_imtool_connection ( name, in
- * Subroutine: imtool_output
- * Purpose: Write image data back to iraf device channel
- */
-+
-+static int compact_short_to_byte();
-+
- void imtool_output ( imhead, odev, imagebuf, width, height )
- struct imtoolRec *imhead;
- struct connectRec *odev;
-@@ -116,7 +119,6 @@ void imtool_output ( imhead, odev, image
- int buferr = 0;
- char fifobuf[SZ_FIFOBUF + 4];
- int write_connection();
-- static int compact_short_to_byte();
-
- ndatabytes = -(int)imhead->thingct;
- x = imhead->x & 077777;
-@@ -153,6 +155,9 @@ void imtool_output ( imhead, odev, image
- * Called by: imtool_response() in RemoteImtool.c
- * Returns: -1 if read no bytes, 1 if trouble, else 0
- */
-+
-+static void expand_byte_to_short();
-+
- int imtool_input ( imhead, idev, readbuf, iwdth, owdth, y1, y2,
- imagebuf, imbufsz )
- struct imtoolRec *imhead;
-@@ -171,7 +176,6 @@ int imtool_input ( imhead, idev, readbuf
- int got, try, gotten;
- short *obuf;
- int read_connection();
-- static void expand_byte_to_short();
-
- /* get data count and packing type */
- ndatavals = -(int)imhead->thingct;
---- irafpipe.c.orig 1998-02-25 19:52:26 UTC
-+++ irafpipe.c
-@@ -33,6 +33,9 @@ static char SccsId[] = "%W% %G%";
- * Subroutine: read_imtool_packet()
- * Purpose: event handler for packet input from iraf
- */
-+
-+static int check_packet_sum();
-+
- void read_imtool_packet( port )
- struct connectRec *port;
- {
-@@ -48,7 +51,6 @@ void read_imtool_packet( port )
- #endif
- int read_connection();
- void imtool_response(), swap_bytes();
-- static int check_packet_sum();
-
- /* read the header */
- bytes = read_connection(port, (char *)&imhead, sizeof(struct imtoolRec));
---- maininit.c.orig 2003-12-01 23:21:35 UTC
-+++ maininit.c
-@@ -76,11 +76,13 @@ Display *display; /* display connection
- * Xlib calls: XSetErrorHandler()
- * UNIX calls: setrlimit()
- */
-+
-+static void init_params(), init_packages();
-+
- main(argc, argv)
- int argc;
- char **argv;
- {
-- static void init_params(), init_packages();
- void crash_on_error(), control_event_loop();
- void say_goodbye();
-
-@@ -141,13 +143,15 @@ void say_goodbye ( code )
- * Purpose: Initialize parameters in the records
- * Note: Resource or default file not yet used
- */
-+
-+static void init_server();
-+
- static void init_params ( argc, argv )
- int argc;
- char **argv;
- {
- char *name; /* l: both flag for init and return display name */
- int parse_stat;
-- static void init_server();
- int parse_cmdline(), check_image();
- void say_goodbye(), init_connections();
-
---- mainkey.c.orig 2003-09-24 22:38:25 UTC
-+++ mainkey.c
-@@ -87,6 +87,9 @@ static double oldypix = 0.0;
-
- static double oldxpos, oldypos;
-
-+static void PrintFITSHead();
-+static int new_image();
-+
- void
- key_response()
- {
-@@ -110,7 +113,6 @@ key_response()
- void print_center(), print_cursor();
- void move_pointer();
- void get_cursor_pos();
-- static void PrintFITSHead();
- void toggle_region_visibility(), toggle_region_labeling();
- double xbuf, ybuf, xfile, yfile;
- double newxpos, newypos, distance;
---- mgfyctrl.c.orig 1999-05-06 19:47:12 UTC
-+++ mgfyctrl.c
-@@ -45,12 +45,14 @@ extern struct magRec magset;
- * Purpose: Magnify location of a dispbox event
- * Xlib calls: XCheckWindowEvent(), XSync()
- */
-+
-+static void label_file_coords(), label_file_coords_proportional();
-+
- void magnify_disp ( event, view, text )
- XEvent *event; /* i: XEvent for location of mouse */
- int view, text;
- {
- void draw_magnifier();
-- static void label_file_coords(), label_file_coords_proportional();
-
- /* get only the most recent mouse moved event */
- XSync(dispbox.display, 0);
-@@ -132,6 +134,9 @@ void redraw_magnifier ( )
- * Purpose: Show pointer coordinates and image value in display window
- * Xlib calls: XDrawImageString()
- */
-+
-+static void draw_proportional_coord();
-+
- static void label_file_coords ( bufX, bufY )
- double bufX, bufY;
- {
-@@ -142,7 +147,6 @@ static void label_file_coords ( bufX, bu
- float fileX, fileY;
- GC gc, set_edit_gc();
- void d_transform();
-- static void draw_proportional_coord();
- static int lwcs0 = 0;
- static int lpix0 = 0;
- int i;
-@@ -289,6 +293,9 @@ void clear_coord_area ()
- * but has not been refined for the val section.
- * Xlib call: XDrawImageString()
- */
-+
-+static void draw_proportional_number();
-+
- static void label_file_coords_proportional ( bufX, bufY )
- double bufX, bufY;
- {
-@@ -297,7 +304,6 @@ static void label_file_coords_proportion
- float fileX, fileY;
- GC gc, set_edit_gc();
- void d_transform();
-- static void draw_proportional_number();
-
- gc = set_edit_gc(magset.text.font,
- magset.text.foreground, magset.text.background);
---- mgfytabl.c.orig 1998-07-09 16:28:28 UTC
-+++ mgfytabl.c
-@@ -30,6 +30,10 @@ static char SccsId[] = "%W% %G%";
- * coordinates
- * Note: Uses event coords in control struct (control.event.xkey)
- */
-+
-+static int get_key_buf_coords(), set_table_params();
-+static void output_column_labels(), output_pixval_table();
-+
- void print_table ()
- {
- int bufx, bufy;
-@@ -39,8 +43,6 @@ void print_table ()
- int table_size;
- int col_width;
- int rot;
-- static int get_key_buf_coords(), set_table_params();
-- static void output_column_labels(), output_pixval_table();
-
- /* determine the buffer coordinates of the event */
- if( get_key_buf_coords(&control.event.xkey, &bufx, &bufy) == 0 ) {
---- pancrsr.c.orig 1990-05-02 06:49:17 UTC
-+++ pancrsr.c
-@@ -45,13 +45,15 @@ void draw_pancursor ( )
- * Subroutine: new_pancursor
- * Purpose: Create and draw panbox cursor given image coordinates
- */
-+
-+static void set_pancursor();
-+
- void new_pancursor ( track )
- int track;
- {
- float panX1, panX2, panY1, panY2;
- GC gc, set_gc();
- void disp_window(), i_transform();
-- static void set_pancursor();
-
- if( pancur_present ) {
- /* erase the old box if it was visible */
---- panimage.c.orig 1990-04-20 16:17:38 UTC
-+++ panimage.c
-@@ -45,12 +45,14 @@ void disp_panbox ( )
- * Subroutine: map_panbox
- * Purpose: Fill the panbox display buffer, mapping from its short buffer
- */
--void map_panbox ( )
--{
-- static void map_panbuf();
-+
-+static void map_panbuf();
- #ifdef SUMBLOCK
-- static void map_adj_panbuf();
-+static void map_adj_panbuf();
- #endif
-+
-+void map_panbox ( )
-+{
- void panimage_halftone();
-
- if( color.ncolors <= 1 ) {
---- prntcent.c.orig 1999-08-20 22:18:40 UTC
-+++ prntcent.c
-@@ -36,6 +36,11 @@ static char SccsId[] = "%W% %G%";
- * Returns 1 if successful, else 0
- * Note: Uses event coords in control struct (control.event.xkey)
- */
-+
-+static int set_center_param();
-+static int get_key_buf_coord();
-+static void comp_center ();
-+
- void
- print_center ( xc, yc )
-
-@@ -59,9 +64,6 @@ double *xc, *yc; /* Returned centroided
- int xfile, yfile;
- char string[64];
- int lstr = 48;
-- static int set_center_param();
-- static int get_key_buf_coord();
-- static void comp_center ();
- void d_trans();
- int iswcs();
-
---- prntcurs.c.orig 2002-01-16 22:54:18 UTC
-+++ prntcurs.c
-@@ -31,12 +31,14 @@ static char SccsId[] = "%W% %G%";
- * Subroutine: print_cursor
- * Purpose: print location of a dispbox event
- */
-+
-+static void print_file_value();
-+
- void print_cursor ( event )
- XEvent *event; /* XEvent for location of mouse */
- {
- double bufx, bufy, filex, filey;
- void get_cursor_pos();
-- static void print_file_value();
-
- (void)get_cursor_pos (event, &bufx, &bufy, &filex, &filey );
- (void)print_file_value ( bufx, bufy, filex, filey );
---- readarr.c.orig 1999-02-23 14:05:41 UTC
-+++ readarr.c
-@@ -28,6 +28,9 @@ static char SccsId[] = "%W% %G%";
- * Purpose: Read array data from a file
- * Note: Assumes file was tested benignly, exits here if trouble
- */
-+
-+static int read_data();
-+
- void read_array ( fd, img, imgbuf, filebuf, width, height, X, Y, block,
- verbose )
- int fd; /* if >=0 handle to open & ready image file */
-@@ -40,7 +43,6 @@ void read_array ( fd, img, imgbuf, fileb
- int verbose; /* whether to print explanatory messages */
- {
- int vals;
-- static int read_data();
- int image_start;
- int open_disk(), lseek_disk();
- void close_disk();
---- readfith.c.orig 1998-09-29 15:40:06 UTC
-+++ readfith.c
-@@ -46,6 +46,9 @@ static char SccsId[] = "%W% %G%";
- * Purpose: Find important FITS parameters in FITS header
- * Returns: 1 if success, else 0
- */
-+
-+static int get_keyint(), get_keyfloat();
-+
- int read_fitsheader ( header, length, bitpix, naxis, naxes, scale, bias )
- char *header;
- int length;
-@@ -55,7 +58,6 @@ int read_fitsheader ( header, length, bi
- float *scale;
- float *bias;
- {
-- static int get_keyint(), get_keyfloat();
- struct WorldCoor *wcsinit();
- char *header0;
- header0 = header;
-@@ -144,6 +146,9 @@ static int get_keyint ( header, keyword,
- * Purpose: Return the float value in the data field for a given FITS
- * header keyword. If key not found, return 0.
- */
-+
-+static void fix_exponent();
-+
- static int get_keyfloat ( header, keyword, length, val, report_error)
- char *header; /* buffer start */
- char *keyword; /* keyword to match */
-@@ -153,7 +158,6 @@ static int get_keyfloat ( header, keywor
- {
- int key_not_end;
- int i;
-- static void fix_exponent();
- void no_fitscomment();
-
- key_not_end = (strncmp(keyword, "END ", 8) != 0);
---- rgnanli.c.orig 1990-04-20 16:25:03 UTC
-+++ rgnanli.c
-@@ -89,14 +89,16 @@ void new_annulus_edge ( cursor )
- * Note: "vala valb valc ..." and "val1 val2 n=int" are both
- * permitted syntax forms
- */
-+
-+static int expand_radii();
-+static char *got_nequal();
-+
- int parse_radii ( line, radius, maxcnt )
- char *line; /* i: string with first radius as next token */
- float *radius; /* o: buffer for float radius vals */
- int maxcnt; /* i: size of radius buffer */
- {
- int i, cnt;
-- static int expand_radii();
-- static char *got_nequal();
- char *next_token();
-
- i = 0;
---- rgndraw.c.orig 1998-11-30 21:46:40 UTC
-+++ rgndraw.c
-@@ -115,12 +115,14 @@ void disp_regions ( cursor )
- * Subroutine: disp_region
- * Purpose: Draw one saved cursor region and its labels
- */
-+
-+static GC set_region_gc();
-+static void label_annuli(), label_region(), draw_region();
-+
- void disp_region ( region )
- struct cursorRec *region;
- {
- GC gc;
-- static GC set_region_gc();
-- static void label_annuli(), label_region(), draw_region();
-
- if( rgdraw.visible && (region != NULL) ) {
- gc = set_region_gc(region);
-@@ -215,11 +217,13 @@ static void draw_region_label ( string,
- * Purpose: Draw one saved cursor region outline or point index
- * Note: gc is already set, hence NULL GCspec in draw calls
- */
-+
-+static void draw_region_label();
-+
- static void draw_region ( region, gc )
- struct cursorRec *region;
- GC gc;
- {
-- static void draw_region_label();
- void draw_annuli(), draw_cursor();
-
- if( region->type != COP_Point ) {
-@@ -246,12 +250,14 @@ static void draw_region ( region, gc )
- /*
- * Subroutine: label_annuli
- */
-+
-+static void label_region();
-+
- static void label_annuli ( region, gc )
- struct cursorRec *region;
- GC gc;
- {
- struct cursorRec *annulus;
-- static void label_region();
-
- /* apply label to outer annulus */
- annulus = region;
-@@ -268,6 +274,10 @@ static void label_annuli ( region, gc )
- * Purpose: Draw one region's label line and text for center and edge
- * Xlib calls: XDrawLine()
- */
-+
-+static int mark_include();
-+static void draw_region_label();
-+
- static void label_region ( region, gc )
- struct cursorRec *region;
- GC gc;
-@@ -277,8 +287,6 @@ static void label_region ( region, gc )
- char edge_string[132];
- int len;
- int exclude;
-- static int mark_include();
-- static void draw_region_label();
-
- /* if label not requested or don't know how to label or will another part */
- if( (!rgdraw.label) || (region->type == COP_Polygon) )
---- rgndrop.c.orig 1990-04-20 16:31:38 UTC
-+++ rgndrop.c
-@@ -64,14 +64,16 @@ void unsave_region ( cursor, dead_meat )
- * cursors enclose one or two digit label but have 0 area).
- * In case of equal areas (i.e. points), closer center is used.
- */
-+
-+static int pointer_is_inside_region();
-+static int closer_to_center();
-+
- struct cursorRec *region_indicated_by_pointer ( cursor, x, y, point_only )
- struct cursorRec *cursor;
- int x, y;
- int point_only;
- {
- struct cursorRec *region, *chosen;
-- static int pointer_is_inside_region();
-- static int closer_to_center();
-
- chosen = NULL;
- region = cursor->next_region;
-@@ -115,13 +117,15 @@ static int closer_to_center ( challenger
- * Subroutine: is_inside_region
- * Purpose: Determine if mouse is within a region
- */
-+
-+static int pointer_is_inside_polygon();
-+
- static int pointer_is_inside_region ( x, y, region )
- int x, y;
- struct cursorRec *region;
- {
- double rayX, rayY, ray;
- int inside;
-- static int pointer_is_inside_polygon();
-
- if( region->type == COP_Polygon )
- return( pointer_is_inside_polygon((double)x, (double)y,
---- rgnwpros.c.orig 1991-01-09 03:57:30 UTC
-+++ rgnwpros.c
-@@ -45,11 +45,13 @@ static char SccsId[] = "%W% %G%";
- * Purpose: Write ROSAT PROS style region description to file
- * Method: Recurse first to start writing from end of link list
- */
-+
-+static void cat_annulus(), write_annuli(), cat_shape();
-+
- void write_region_pros ( fd, region )
- FILE *fd;
- struct cursorRec *region;
- {
-- static void cat_annulus(), write_annuli(), cat_shape();
-
- /* Check for pointer before doing anything */
- if( region == NULL )
-@@ -84,13 +86,15 @@ void write_region_pros ( fd, region )
- /* Subroutine: cat_shape
- * Purpose: Put simple PROS description of given cursor in line buffer
- */
-+
-+static void cat_polypts(), cat_cen(), cat_params();
-+
- static void cat_shape ( region, line )
- struct cursorRec *region;
- char *line;
- {
- int params;
- void write_text_region();
-- static void cat_polypts(), cat_cen(), cat_params();
-
- switch( region->type ) {
- case COP_Box:
-@@ -205,12 +209,14 @@ static void cat_cen ( region, line )
- * Subroutine: cat_polypts
- * Purpose: Add list of point coordinates to line buffer (for polygon)
- */
-+
-+static void cat_pt();
-+
- static void cat_polypts ( region, line )
- struct cursorRec *region;
- char *line;
- {
- int i;
-- static void cat_pt();
-
- cat_pt((double)region->poly[0].fileX, (double)region->poly[0].fileY,
- line, 0);
-@@ -254,12 +260,14 @@ static void cat_pt ( x, y, line, comma )
- * Purpose: Put a PROS style description of circular annuli on the
- * line buffer
- */
-+
-+static void cat_cen();
-+
- static void cat_annulus ( region, line )
- struct cursorRec *region;
- char *line;
- {
- char radius[16];
-- static void cat_cen();
-
- (void)strcat(line, "ANNULUS(");
- cat_cen(region, line);
-@@ -275,14 +283,16 @@ static void cat_annulus ( region, line )
- * Subroutine: write_annuli
- * Purpose: Write PROS type description to produce annuli of given shapes
- */
-+
-+static struct cursorRec *cat_annular();
-+static void cat_shape();
-+
- static void write_annuli ( region, line, fd )
- struct cursorRec *region;
- char *line;
- FILE *fd;
- {
- struct cursorRec *annulus;
-- static struct cursorRec *cat_annular();
-- static void cat_shape();
-
- /* annuli start with next_annulus (base region is not one of them) */
- if( (annulus = region->next_annulus) != NULL ) {
-@@ -309,11 +319,13 @@ static void write_annuli ( region, line,
- * Purpose: Add outer shape anded with not of inner shape to make
- * an annular ring
- */
-+
-+static void cat_shape();
-+
- static struct cursorRec *cat_annular ( region, line )
- struct cursorRec *region;
- char *line;
- {
-- static void cat_shape();
-
- if( region->next_annulus != NULL ) {
- if( region->exclude_region )
---- rgnwrite.c.orig 1995-09-08 22:29:19 UTC
-+++ rgnwrite.c
-@@ -58,6 +58,9 @@ EditStruct *region_edit;
- * Subroutine: write_regions
- * Purpose: Write region info to a file
- */
-+
-+static void write_region_imtool();
-+
- void write_regions ( cursor, image, output_type )
- struct cursorRec *cursor;
- struct imageRec *image;
-@@ -66,7 +69,6 @@ void write_regions ( cursor, image, outp
- FILE *fd;
- static int last_output_type = 0;
- char fname[SZ_FNAME];
-- static void write_region_imtool();
- int open_output_file();
- EditStruct *init_edit_popup();
- void set_path_iraf(), write_region_pros(), load_edit_struct(), timestamp();
-@@ -146,13 +148,15 @@ static void write_region_imtool ( fd, re
- * Subroutine: timestamp
- * Purpose: Write date and filename (if known) to region file
- */
-+
-+static void set_time_string();
-+
- void timestamp ( fd, imagename )
- FILE *fd;
- char *imagename;
- {
- char line[SZ_LINE];
- int len;
-- static void set_time_string();
-
- /* timestamp the first entry in the output file. */
- set_time_string (line);
---- sclctrl.c.orig 1996-10-10 15:55:57 UTC
-+++ sclctrl.c
-@@ -70,6 +70,9 @@ void select_scalemap ()
- * Subroutine: new_scalemap
- * Purpose: Scalemap calculation for a new image
- */
-+
-+static void new_histogram();
-+
- void new_scalemap ( )
- {
- static double cmdMin = 0.0;
-@@ -78,7 +81,6 @@ void new_scalemap ( )
- static int max_given = 0;
- static int imtool_200 = 0;
- static int init = 1; /* identify first time called */
-- static void new_histogram();
- void make_scalemap(), color_logo();
- #ifdef IMTOOL
- void set_imtool_colors();
---- sclmap.c.orig 1994-10-25 15:25:02 UTC
-+++ sclmap.c
-@@ -36,11 +36,13 @@ static char SccsId[] = "%W% %G%";
- * Note: Map goes from image value to hardware value (through ideal
- * map value using pixels array from XAllocColors)
- */
-+
-+static void linear_scale(), wrap_scale(), sqrt_scale(), log_scale();
-+
- void make_scalemap ( image_min, image_max )
- int image_min, image_max; /* i: range of mapping for image data input */
- {
- void histogram_equalize();
-- static void linear_scale(), wrap_scale(), sqrt_scale(), log_scale();
-
- /* note the range of data for which mapping is to be calculated */
- if( image_max == image_min )
-@@ -105,6 +107,9 @@ void make_scalemap ( image_min, image_ma
- * Subroutine: linear_scale
- * Purpose: Distribute color levels in the map evenly
- */
-+
-+static void get_histogram_range();
-+
- static void linear_scale ( image_min, image_max )
- int image_min, image_max; /* i: limits of values in display */
- {
-@@ -118,7 +123,6 @@ static void linear_scale ( image_min, im
- register int imageval;
- register int pixval;
- register int imagelim;
-- static void get_histogram_range();
-
- range_min = image_min;
- range_max = image_max;
---- wndwconf.c.orig 1995-01-21 00:27:13 UTC
-+++ wndwconf.c
-@@ -55,9 +55,11 @@ static unsigned int geo_width, geo_heigh
- * Method: The size can be given or set to norm. If given but less
- * than min (i.e. 0,0) it becomes the minimum configuration.
- */
-+
-+static void set_parsed_geometry();
-+
- void init_desktop ( )
- {
-- static void set_parsed_geometry();
-
- desktop.hints.min_width =
- (2 * desktop.xzero) + (2 * dispbox.bdrwidth) + dispbox.hints.min_width;
---- wndwinit.c.orig 2001-12-14 23:19:23 UTC
-+++ wndwinit.c
-@@ -53,11 +53,13 @@ static char **cmd_argv; /* i: command l
- * Uses: create_window() in WndwCreate.c
- * Xlib calls: DisplayWidth(), DisplayHeight();
- */
-+
-+static void set_window_basics();
-+
- void init_windows1 ( argc, argv )
- int argc; /* i: command line arg count param */
- char **argv; /* i: command line args */
- {
-- static void set_window_basics();
- void init_desktop(), create_window();
-
- /* set display screen parameters for all to see */
-@@ -81,9 +83,11 @@ void init_windows1 ( argc, argv )
- * Uses: configure_windows() in WndwConfig.c
- * Uses: get_window_dimensions(), create_window() in WndwCreate.c
- */
-+
-+static void init_window_basics(), set_border_color();
-+
- void init_windows2 ( )
- {
-- static void init_window_basics(), set_border_color();
- void get_window_dimensions(), configure_windowgroup(), create_window();
-
- /* install runtime environment parameters for all windows */
-@@ -175,11 +179,13 @@ void raise_windows ( )
- * Subroutine: init_window_basics, set_window_basics
- * Purpose: Set the runtime environment parameters
- */
-+
-+static void set_window_basics();
-+
- static void init_window_basics ( border_pixel )
- int border_pixel;
- {
- XImage *ximage;
-- static void set_window_basics();
-
- ximage = XCreateImage(desktop.display, color.visual, color.screen_depth,
- dispbox.image.format, 0, malloc(4), 2, 2,
---- wndwmaus.c.orig 2001-12-19 22:06:46 UTC
-+++ wndwmaus.c
-@@ -61,11 +61,13 @@ static Cursor keycursor;
- * Subroutine: init_mousepointers
- * Purpose: Set up the various mouse pointer icons for all windows
- */
-+
-+static Cursor make_mouse_cursor();
-+
- void init_mousepointers ( dispdisplay, auxdisplay )
- Display *dispdisplay; /* i: display for the dispbox */
- Display *auxdisplay; /* i: display for the auxiliary windows */
- {
-- static Cursor make_mouse_cursor();
-
- /* create special btnbox cursor for button menu window */
- btnbox.attrs.cursor =
diff --git a/astro/saoimage/files/patch-makefile.FreeBSD b/astro/saoimage/files/patch-makefile.FreeBSD
deleted file mode 100644
index b9c3ad9da248..000000000000
--- a/astro/saoimage/files/patch-makefile.FreeBSD
+++ /dev/null
@@ -1,68 +0,0 @@
---- makefile.FreeBSD.orig 2003-04-01 17:34:57 UTC
-+++ makefile.FreeBSD
-@@ -36,9 +36,9 @@
- # FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of
- # the CFLAGS macro below.)
-
--SAOBINDIR = $(ROOT)/usr/local/bin/
--SAOMANDIR = $(ROOT)/usr/local/man/manl/
--IMTRCDIR = $(ROOT)/usr/local/lib/
-+SAOBINDIR = $(ROOT)$(PREFIX)/bin/
-+SAOMANDIR = $(ROOT)$(PREFIX)/man/manl/
-+IMTRCDIR = $(ROOT)$(PREFIX)/etc/
-
- IMTOOLRC = $(IMTRCDIR)imtoolrc
- FIFO_I = $(ROOT)/dev/imt1i
-@@ -46,7 +46,7 @@ FIFO_O = $(ROOT)/dev/imt1o
- FIFO_LN = $(ROOT)/dev/imt1
-
- # Compiler specification.
--CC = cc
-+CC ?= cc
- # Uncomment these two lines to compile with gcc (add any optimizers you wish).
- #CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce
- # Delayed branches could win big on RISC: many inner loops have branches
-@@ -76,12 +76,12 @@ MFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT
- # OFLAGS: compiler optimization/debug options.
-
- #OFLAGS = -g -DDEBUG
--OFLAGS = -O2 -m486 -pipe
-+OFLAGS ?= -O2 -m486 -pipe
-
- # ADFLAGS: architecture-dependent floating point flags, etc.
-
- #ADFLAGS = -I/usr/openwin/share/include # ATTENTION: OpenWindows users...
--ADFLAGS = -I/usr/X11R6/include
-+ADFLAGS = -I${LOCALBASE}/include
-
- # Libraries that move about or may require special specification.
- #
-@@ -89,7 +89,7 @@ ADFLAGS = -I/usr/X11R6/include
- # usual link search path, i.e., it is not in /usr/lib, it may be necessary
- # to specify its path fully in XLIB.
-
--XLIB = -L/usr/X11R6/lib -lX11
-+XLIB = -L${LOCALBASE}/lib -lX11
- #XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users...
- #F77LIB = -lF77 -lI77 -lU77
- F77LIB = -lf2c
-@@ -307,7 +307,7 @@ tape:
- $(MAKE) ARCFILE=$(TAPEDEV) tar
-
-
--XLIBH = /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/Xutil.h
-+XLIBH = ${LOCALBASE}/include/X11/Xlib.h ${LOCALBASE}/include/X11/Xutil.h
- STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \
- hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h
- WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH)
-@@ -419,8 +419,8 @@ maininit.o : $(XLIBH) $(STRUCT) hfiles/c
- defs/dispbox.def defs/magnibox.def defs/panbox.def \
- defs/btnbox.def defs/colorbox.def defs/graphbox.def \
- defs/desktop.def defs/cursor.def
--mainkey.o : $(WORKS) /usr/include/X11/keysym.h \
-- /usr/include/X11/keysymdef.h
-+mainkey.o : $(WORKS) ${LOCALBASE}/include/X11/keysym.h \
-+ ${LOCALBASE}/include/X11/keysymdef.h
- #mainkey.o : $(WORKS) # for OpenWindows
- mainslct.o : $(WORKS)
- mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h
diff --git a/astro/saoimage/files/patch-rgnwrite.c b/astro/saoimage/files/patch-rgnwrite.c
deleted file mode 100644
index 7ec00f613021..000000000000
--- a/astro/saoimage/files/patch-rgnwrite.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- rgnwrite.c.orig 1995-09-08 22:29:19 UTC
-+++ rgnwrite.c
-@@ -183,7 +183,7 @@ static void set_time_string ( time_strin
- #ifdef LONG64
- int time();
- #else
--#ifndef VMS
-+#if !defined(VMS) && !defined(__FreeBSD__)
- long time();
- #else
- time_t time();
diff --git a/astro/saoimage/pkg-descr b/astro/saoimage/pkg-descr
deleted file mode 100644
index 146474faeb9a..000000000000
--- a/astro/saoimage/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-SAOimage (pronounced S-A-0-image) displays astronomical images in the X11
-window environment. It was written by Mike Van Hilst while he was at the
-Smithsonian Astrophysical Observatory (SAO) in 1990 and is now maintained by
-Doug Mink also at the SAO.
-
-Online help and documentation are on the webpage.
-
-Image files can be read directly, or image data may be passed through a
-named pipe (Unix) or a mailbox (VMS) from IRAF display tasks. SAOimage
-provides a large selection of options for zooming, panning, scaling,
-coloring, pixel readback, display blinking, and region specification. User
-interactions are generally performed with the mouse, but keyboard
-alternatives are often available.
-
-The SAOimage desktop includes, a main image display window, a button menu
-panel, a display magnifier, a pan and zoom reference image, and a color bar.
-A color table graph window can be brought up by clicking on the color bar.
-
-WWW: http://tdc-www.harvard.edu/software/saoimage/
generated by cgit (git 2.34.1) at 2025-02-05 23:26:47 +0800