From 5ac5b23f9f0fd9ed14e65f7c82d04705158872d6 Mon Sep 17 00:00:00 2001 From: kevlo Date: Sat, 6 Jan 2001 16:40:16 +0000 Subject: Update to 0.9.3 PR: 24097 Submitted by: Ports Fury --- shells/flash/Makefile | 59 ++++++++++++++++++++-------------------- shells/flash/distinfo | 2 +- shells/flash/files/patch-aa | 66 ++++++++++++--------------------------------- shells/flash/files/patch-ab | 10 ------- shells/flash/files/patch-ac | 11 -------- shells/flash/files/patch-ad | 6 ++--- shells/flash/files/patch-ae | 10 ------- shells/flash/files/patch-af | 10 ------- shells/flash/files/patch-ag | 10 ------- shells/flash/files/patch-ak | 22 ++++++++------- shells/flash/pkg-message | 5 ++++ shells/flash/pkg-plist | 2 +- 12 files changed, 69 insertions(+), 144 deletions(-) delete mode 100644 shells/flash/files/patch-ab delete mode 100644 shells/flash/files/patch-ac delete mode 100644 shells/flash/files/patch-ae delete mode 100644 shells/flash/files/patch-af delete mode 100644 shells/flash/files/patch-ag create mode 100644 shells/flash/pkg-message (limited to 'shells/flash') diff --git a/shells/flash/Makefile b/shells/flash/Makefile index a11c6aaefc89..48773288e337 100644 --- a/shells/flash/Makefile +++ b/shells/flash/Makefile @@ -6,7 +6,7 @@ # PORTNAME= flash -PORTVERSION= 0.9.1 +PORTVERSION= 0.9.3 CATEGORIES= shells MASTER_SITES= ftp://ftp.netsoc.ucd.ie/pub/computing/flash/ @@ -19,40 +19,44 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= ncurses.5:${PORTSDIR}/devel/ncurses .endif -GNU_CONFIGURE= yes USE_GMAKE= yes -MAKE_ENV= prefix=${PREFIX} -WRKSRC= ${WRKDIR}/flash +GNU_CONFIGURE= yes + MAN1= flash.1 -pre-configure: +PROGRAM= background countdown +SCRIPT= mailshell system.menu system.menu.9798 system.menu.oldlast \ + system.menu.old +DATA= checkflash system.bg.Netsoc.3 system.bg.Netsoc.4 \ + system.flashlogin system.maillogin system.module \ + system.module.9798 system.rc system.rc.mailshell + .if ${OSVERSION} < 400000 -MAKE_ENV+= NCURSES=-DHAVE_NCURSES_NCURSES_H \ - NC_CFLAGS="-I${LOCALBASE}/include" \ - NC_LFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_NCURSES_NCURSES_H" \ + LDFLAGS="-L${LOCALBASE}/lib" .endif -pre-build: - @${RM} -rf ${WRKSRC}/modules/countdown ${WRKSRC}/modules/background +post-patch: +.for file in ${SCRIPT} + @${PERL} -pi -e "s:/usr/slocal:${PREFIX}:g" ${WRKSRC}/orcasetup/${file} +.endfor do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/flash ${PREFIX}/bin - @${MKDIR} ${PREFIX}/lib/flash/flashdocs/ -.for DOC in checkflash system.bg.Netsoc.3 system.bg.Netsoc.4 system.flashlogin \ - system.maillogin system.module system.module.9798 system.rc system.rc.mailshell - @${INSTALL_DATA} ${WRKSRC}/orcasetup/${DOC} ${PREFIX}/lib/flash/ + ${INSTALL_PROGRAM} ${WRKSRC}/flash ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/flash.1 ${MANPREFIX}/man/man1 + @${MKDIR} ${PREFIX}/lib/flash + ${INSTALL_DATA} ${WRKSRC}/Manual ${PREFIX}/lib/flash +.for file in ${PROGRAM} + ${INSTALL_PROGRAM} ${WRKSRC}/modules/${file} ${PREFIX}/lib/flash .endfor -.for PROG in background countdown - @${INSTALL_PROGRAM} ${WRKSRC}/modules/${PROG} ${PREFIX}/lib/flash/ +.for file in ${SCRIPT} + ${INSTALL_SCRIPT} ${WRKSRC}/orcasetup/${file} ${PREFIX}/lib/flash .endfor -.for SCRIPT in mailshell system.menu system.menu.9798 system.menu.oldlast system.menu~ \ - system.menu.old - @${PERL} -pi -e "s:/usr/slocal:${PREFIX}:g" ${WRKSRC}/orcasetup/${SCRIPT} - @${INSTALL_SCRIPT} ${WRKSRC}/orcasetup/${SCRIPT} ${PREFIX}/lib/flash +.for file in ${DATA} + ${INSTALL_DATA} ${WRKSRC}/orcasetup/${file} ${PREFIX}/lib/flash .endfor - @${INSTALL_DATA} ${WRKSRC}/orcasetup/flashdocs/* ${PREFIX}/lib/flash/flashdocs/ - @${INSTALL_MAN} ${WRKSRC}/flash.1 ${PREFIX}/man/man1 - @${INSTALL_PROGRAM} ${WRKSRC}/flash ${PREFIX}/bin + @${MKDIR} ${PREFIX}/lib/flash/flashdocs + ${INSTALL_DATA} ${WRKSRC}/orcasetup/flashdocs/* ${PREFIX}/lib/flash/flashdocs post-install: @${ECHO} "Updating /etc/shells" @@ -60,11 +64,6 @@ post-install: @(${GREP} -v ${PREFIX}/bin/flash /etc/shells.bak; \ ${ECHO} ${PREFIX}/bin/flash) > /etc/shells @${RM} /etc/shells.bak - @${ECHO} - @${ECHO} " -------------------- WARNING -------------------------- " - @${ECHO} "This software is not yet ready-to-go on your system. You " - @${ECHO} "need to configure flash in ${PREFIX}/lib/flash in order for" - @${ECHO} "it to work properly." - @${ECHO} + @${SED} -e "s:/usr/local:${PREFIX}:g" ${PKGMESSAGE} .include diff --git a/shells/flash/distinfo b/shells/flash/distinfo index 6a1991c6cbf8..081402fd5ab8 100644 --- a/shells/flash/distinfo +++ b/shells/flash/distinfo @@ -1 +1 @@ -MD5 (flash-0.9.1.tar.gz) = 8b26c4d562b43d531b836b2279dad447 +MD5 (flash-0.9.3.tar.gz) = 21ef655a39f873df2cb930aa58831a38 diff --git a/shells/flash/files/patch-aa b/shells/flash/files/patch-aa index a2bce4960dc8..83b4b16491e7 100644 --- a/shells/flash/files/patch-aa +++ b/shells/flash/files/patch-aa @@ -1,56 +1,24 @@ ---- Makefile.in Mon Jun 28 11:28:50 1999 -+++ Makefile.in.new Sun Jan 2 21:49:48 2000 -@@ -7,9 +7,8 @@ - INITIALMENU = system.menu - - # Directory to install everything to --prefix = /usr/slocal - EXEC_PREFIX = ${prefix} --BINDIR = $(EXEC_PREFIX)/bin -+BINDIR = $(EXEC_PREFIX)/sbin - LIBDIR = $(prefix)/lib/flash - MANDIR = $(prefix)/man/man1 - -@@ -23,29 +22,38 @@ - TAR = tar - TAROPTIONS = zcvf - RELNAME = $(PROGNAME).tar.gz -+NCURSES ?= -+NC_CFLAGS ?= -+NC_LFLAGS ?= +--- Makefile.in.orig Tue Jan 18 04:52:08 2000 ++++ Makefile.in Sat Jan 6 11:45:02 2001 +@@ -30,16 +30,16 @@ # C Compiler - CC = gcc - DEBUG = -g - #DEBUG = -DDEBUG -g - #CPPFLAGS = -I/usr/include/ncurses -DHAVE_CONFIG_H -DPREFIX=\"/usr/slocal\" #-DDEBUG --CPPFLAGS = -DHAVE_CONFIG_H -DPREFIX=\"/usr/slocal\" -DDONT_HIGHLIGHT_WITH_REVERSE #-DLITTLE_ENDIAN -+CPPFLAGS = $(NCURSES) $(NC_CFLAGS) -DHAVE_CONFIG_H -DPREFIX=\"$(prefix)\" -DDONT_HIGHLIGHT_WITH_REVERSE #-DLITTLE_ENDIAN - CFLAGS = -O2 $(CPPFLAGS) $(DEBUG) -Wall -rdynamic - + CC = @CC@ +-DEBUG = -g +-CPPFLAGS = -DHAVE_CONFIG_H -DPREFIX=\"$(EXEC_PREFIX)\" -DDONT_HIGHLIGHT_WITH_REVERSE +-CFLAGS = -O2 $(CPPFLAGS) $(DEBUG) -Wall -rdynamic ++#DEBUG = -g ++CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H -DPREFIX=\"$(EXEC_PREFIX)\" -DDONT_HIGHLIGHT_WITH_REVERSE ++CFLAGS = @CFLAGS@ $(CPPFLAGS) $(DEBUG) + # For Solaris users please use the next 2 lines instead. + #CPPFLAGS = -DHAVE_CONFIG_H -DPREFIX=\"$(EXEC_PREFIX)\" -DDONT_HIGHLIGHT_WITH_REVERSE -DSOLARIS + #CFLAGS = -O2 $(CPPFLAGS) $(DEBUG) -Wall + + # Comment out -rdynamic below for Solaris -LDFLAGS = -rdynamic -LIBRARIES = -lncurses -ldl -+LDFLAGS = -rdynamic $(NC_LFLAGS) -+LIBRARIES = -lncurses ++LDFLAGS = @LDFLAGS@ ++LIBRARIES = @LIBS@ SCREEN_SOURCES = screens/nc_init.c screens/nc_lock.c screens/nc_about.c screens/nc_menus.c screens/nc_misc.c screens/nc_job.c screens/nc_module.c -+MODULE_PROGS = modules/countdown modules/background - SOURCES = main.c parse.c string.c set.c misc.c menu.c exec.c rc.c tree.c parseline.c event.c sha.c module.c debug.c $(SCREEN_SOURCES) - OBJECTS = $(SOURCES:.c=.o) - -+all: $(PROGNAME) -+ - .c.o: - $(CC) $(CFLAGS) -c -o $@ $< - --$(PROGNAME): $(OBJECTS) -+$(PROGNAME): $(OBJECTS) $(MODULE_PROGS) - $(RM) $@ - $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBRARIES) -+ -+$(MODULE_PROGS): -+ $(MAKE) -C modules && $(MAKE) - - shacrypt: - $(CC) $(CFLAGS) -DO_WRAP -o $@ sha.c diff --git a/shells/flash/files/patch-ab b/shells/flash/files/patch-ab deleted file mode 100644 index bb323a2bdf32..000000000000 --- a/shells/flash/files/patch-ab +++ /dev/null @@ -1,10 +0,0 @@ ---- exec.h Wed Mar 5 06:59:11 1997 -+++ exec.h.new Sat Dec 11 01:29:48 1999 -@@ -3,6 +3,7 @@ - - #include - #include -+#include - - #include "parse.h" - #include "menu.h" diff --git a/shells/flash/files/patch-ac b/shells/flash/files/patch-ac deleted file mode 100644 index c127b6b967ac..000000000000 --- a/shells/flash/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- menu.c Sun Apr 13 12:43:26 1997 -+++ menu.c.new Sat Dec 11 01:30:45 1999 -@@ -5,7 +5,7 @@ - #include - #include - #include --#include -+#include - - #include "menu.h" - #include "parse.h" diff --git a/shells/flash/files/patch-ad b/shells/flash/files/patch-ad index a8778c70631b..d33b3a26a4f0 100644 --- a/shells/flash/files/patch-ad +++ b/shells/flash/files/patch-ad @@ -1,10 +1,10 @@ ---- module.c Tue Jun 29 05:36:28 1999 -+++ module.c.new Sat Dec 11 01:34:45 1999 +--- module.c.orig Mon Jan 17 19:56:45 2000 ++++ module.c Sat Jan 6 11:06:54 2001 @@ -25,7 +25,6 @@ #include #include #include --#include +-#include #include #include #include diff --git a/shells/flash/files/patch-ae b/shells/flash/files/patch-ae deleted file mode 100644 index 125eb0dc5c98..000000000000 --- a/shells/flash/files/patch-ae +++ /dev/null @@ -1,10 +0,0 @@ ---- parseline.c Tue Jun 29 05:36:47 1999 -+++ parseline.c.new Sat Dec 11 01:34:21 1999 -@@ -25,7 +25,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/shells/flash/files/patch-af b/shells/flash/files/patch-af deleted file mode 100644 index cf914ddb6a03..000000000000 --- a/shells/flash/files/patch-af +++ /dev/null @@ -1,10 +0,0 @@ ---- rc.c Tue Jun 29 05:36:54 1999 -+++ rc.c.new Sat Dec 11 01:34:05 1999 -@@ -25,7 +25,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/shells/flash/files/patch-ag b/shells/flash/files/patch-ag deleted file mode 100644 index 8eb10506809c..000000000000 --- a/shells/flash/files/patch-ag +++ /dev/null @@ -1,10 +0,0 @@ ---- screens/nc_menus.c Tue Jun 29 05:42:18 1999 -+++ screens/nc_menus.c.new Sat Dec 11 01:36:09 1999 -@@ -783,7 +783,6 @@ - struct menu *menu; - struct menu_items *HK; - int noclobber,gotch; -- char c; - - if (!(firstmenu)) - return; diff --git a/shells/flash/files/patch-ak b/shells/flash/files/patch-ak index 3aceecda21bc..579fd6497f02 100644 --- a/shells/flash/files/patch-ak +++ b/shells/flash/files/patch-ak @@ -1,12 +1,16 @@ ---- modules/Makefile Sat Oct 25 18:59:03 1997 -+++ modules/Makefile.new Sun Jan 2 21:51:53 2000 -@@ -1,7 +1,7 @@ - CC = gcc - DEBUG = #-g +--- modules/Makefile.in.orig Mon Jan 17 23:25:46 2000 ++++ modules/Makefile.in Sat Jan 6 12:11:56 2001 +@@ -1,7 +1,9 @@ +-CC = gcc +-DEBUG = -g -CFLAGS = $(DEBUG) -O3 -fpic -shared -Wall --LDFLAGS = -shared -+CFLAGS = $(NCURSES) $(NC_CFLAGS) $(DEBUG) -O3 -fpic -shared -Wall -+LDFLAGS = $(NC_LFLAGS) -lncurses -shared +-LDFLAGS = -shared ++CC = @CC@ ++#DEBUG = -g ++CFLAGS = @CFLAGS@ $(DEBUG) ++CPPFLAGS = @CPPFLAGS@ -fPIC -DPIC -DHAVE_CONFIG_H ++LIBS = @LIBS@ ++LDFLAGS = @LDFLAGS@ -shared $(LIBS) - OBJECTS = background test alarms countdown + OBJECTS = countdown background test alarms diff --git a/shells/flash/pkg-message b/shells/flash/pkg-message new file mode 100644 index 000000000000..854dd2a6b7c4 --- /dev/null +++ b/shells/flash/pkg-message @@ -0,0 +1,5 @@ + ------------------------ WARNING ------------------------ +This software is not yet ready-to-go on your system. You need +to configure flash in /usr/local/lib/flash in order for it to +work properly. + --------------------------------------------------------- diff --git a/shells/flash/pkg-plist b/shells/flash/pkg-plist index 8998929c168c..176e8786a06e 100644 --- a/shells/flash/pkg-plist +++ b/shells/flash/pkg-plist @@ -1,4 +1,5 @@ bin/flash +lib/flash/Manual lib/flash/background lib/flash/countdown lib/flash/mailshell @@ -10,7 +11,6 @@ lib/flash/system.menu lib/flash/system.menu.9798 lib/flash/system.menu.oldlast lib/flash/system.menu.old -lib/flash/system.menu~ lib/flash/system.module lib/flash/system.module.9798 lib/flash/system.rc -- cgit