diff options
| -rw-r--r-- | emulators/bsvc/Makefile | 44 | ||||
| -rw-r--r-- | emulators/bsvc/distinfo | 2 | ||||
| -rw-r--r-- | emulators/bsvc/files/patch-ad | 28 | ||||
| -rw-r--r-- | emulators/bsvc/files/patch-ae | 11 | ||||
| -rw-r--r-- | emulators/bsvc/files/patch-af | 47 | ||||
| -rw-r--r-- | emulators/bsvc/files/patch-ag | 11 | ||||
| -rw-r--r-- | emulators/bsvc/files/patch-ah | 11 | ||||
| -rw-r--r-- | emulators/bsvc/pkg-plist | 5 |
8 files changed, 122 insertions, 37 deletions
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile index b8daaf335839..0addd8f822cc 100644 --- a/emulators/bsvc/Makefile +++ b/emulators/bsvc/Makefile @@ -1,50 +1,26 @@ # New ports collection Makefile for: bsvc -# Version required: 2.0 +# Version required: 2.1 # Date created: 03-Mar-1997 -# Whom: tenser +# Whom: tenser@spitfire.ecsel.psu.edu # # $FreeBSD$ # -DISTNAME= bsvc-2.0 -CATEGORIES= emulators tk41 +DISTNAME= bsvc-2.1-src +PKGNAME= bsvc-2.1 +CATEGORIES= emulators tk82 MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= system/emulators -EXTRACT_SUFX= -src.tar.z -MAINTAINER= tenser@spitfire.ecsel.psu.edu +MAINTAINER= jseger@FreeBSD.org -RUN_DEPENDS= wish4.1:${PORTSDIR}/x11-toolkits/tk41 +RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 -WRKSRC= ${WRKDIR}/${DISTNAME}/src +WRKSRC= ${WRKDIR}/${PKGNAME}/src -WISH= wish4.1 - -pre-patch: - @${AWK} ' \ - { \ - if (/^## Makefile/) { \ - print "## Makefile.FreeBSD - System Dependent Makefile for FreeBSD" \ - } else { \ - print \ - } \ - }' < ${WRKSRC}/Makefile.ULTRIX > ${WRKSRC}/Makefile +MAKE_ENV= PROJECT_BASE=${PREFIX} WRKSRC=${WRKSRC} post-patch: - @${AWK} ' \ - { \ - if (/PROJECT_BASE/ && /AWK_CHANGE_ME/) { \ - print "PROJECT_BASE='"${WRKDIR}/${DISTNAME}"'" \ - } else if (/INSTALL_DIR/ && /AWK_CHANGE_ME/) { \ - print "INSTALL_DIR='"${PREFIX}/bin"'" \ - } else if (/LIB_DIR/ && /AWK_CHANGE_ME/) { \ - print "LIB_DIR ='"${PREFIX}/lib/bsvc"'" \ - } else if (/WISH/ && /AWK_CHANGE_ME/) { \ - print "WISH='"${WISH}"'" \ - } else { \ - print \ - } \ - }' < ${WRKSRC}/Makefile.common > ${WRKSRC}/Makefile.common.tmp - @${MV} -f ${WRKSRC}/Makefile.common.tmp ${WRKSRC}/Makefile.common + ${CP} ${WRKSRC}/Makefile.ULTRIX ${WRKSRC}/Makefile .include <bsd.port.mk> diff --git a/emulators/bsvc/distinfo b/emulators/bsvc/distinfo index 3482074cddff..5f7fadff2800 100644 --- a/emulators/bsvc/distinfo +++ b/emulators/bsvc/distinfo @@ -1 +1 @@ -MD5 (bsvc-2.0-src.tar.z) = 16e7db549ebd1b142a4fe55c1eefbf85 +MD5 (bsvc-2.1-src.tar.gz) = 5997ba10e2d16b5913851ce2ee360354 diff --git a/emulators/bsvc/files/patch-ad b/emulators/bsvc/files/patch-ad new file mode 100644 index 000000000000..6c920d2beb78 --- /dev/null +++ b/emulators/bsvc/files/patch-ad @@ -0,0 +1,28 @@ +--- Makefile.common.orig Sun Nov 8 22:39:28 1998 ++++ Makefile.common Mon Sep 6 21:43:02 1999 +@@ -12,14 +12,14 @@ + ############################################################################### + + ## Base Directory of the BSVC distribution +-PROJECT_BASE = /home/bwmott/projects/bsvc/development/bsvc ++PROJECT_BASE? = /home/bwmott/projects/bsvc/development/bsvc + + ## Directory to install the BSVC system + INSTALL_DIR = $(PROJECT_BASE)/bin + + ## Name or path and Name of the Tcl/Tk "wish" executable + #WISH = /usr/bin/wish +-WISH = wish ++WISH = wish8.2 + + ## Name of WWW Browser and URL of the BSVC Home Page (or blank) + WWW_BROWSER = +@@ -37,7 +37,7 @@ + ######################### END OF CONFIGURATION ################################ + + INDEPENDENT_PARMS = PROJECT_BASE='$(PROJECT_BASE)' WISH='$(WISH)' \ +- INCLUDES='-I$(PROJECT_BASE)/src/Framework $(SYS_INCLUDE)' \ ++ INCLUDES='-I$(WRKSRC)/Framework $(SYS_INCLUDE)' \ + LIBS='$(SYS_LIBS)' INSTALL_DIR='$(INSTALL_DIR)' \ + WWW_BROWSER='$(WWW_BROWSER)' WWW_HOME_PAGE='$(WWW_HOME_PAGE)' + diff --git a/emulators/bsvc/files/patch-ae b/emulators/bsvc/files/patch-ae new file mode 100644 index 000000000000..57aa6d54817a --- /dev/null +++ b/emulators/bsvc/files/patch-ae @@ -0,0 +1,11 @@ +--- Makefile.ULTRIX.orig Sun Nov 8 22:39:28 1998 ++++ Makefile.ULTRIX Mon Sep 6 19:12:20 1999 +@@ -10,7 +10,7 @@ + CXX = g++ + + ## C and C++ compiler flags +-CCFLAGS = -O ++CCFLAGS ?= -O + CXXFLAGS = -O -ansi -D_G_NO_EXTERN_TEMPLATES + + ## System Includes diff --git a/emulators/bsvc/files/patch-af b/emulators/bsvc/files/patch-af new file mode 100644 index 000000000000..7ca220ac5426 --- /dev/null +++ b/emulators/bsvc/files/patch-af @@ -0,0 +1,47 @@ +--- UI/Makefile.orig Mon Sep 6 19:43:39 1999 ++++ UI/Makefile Mon Sep 6 21:35:14 1999 +@@ -20,31 +20,31 @@ + echo '# export TCL_LIBRARY TK_LIBRARY' >> bsvc + echo 'ARGS=$$*' >> bsvc + echo 'export ARGS' >> bsvc +- echo 'exec $(WISH) -f $(INSTALL_DIR)/UI/bsvc.tk' >> bsvc ++ echo 'exec $(WISH) -f $(PROJECT_BASE)/lib/bsvc/bsvc.tk' >> bsvc + chmod +x bsvc + + bsvc.tk: Makefile + echo '#!$(WISH) -f' > bsvc.tk + echo 'set Program(InstallDir) $(INSTALL_DIR)' >> bsvc.tk +- echo 'set Program(BitmapDir) $$Program(InstallDir)/UI/bitmaps' >> bsvc.tk +- echo 'set Program(HelpDir) $$Program(InstallDir)/UI/help' >> bsvc.tk +- echo 'set Program(LibDir) $$Program(InstallDir)/UI' >> bsvc.tk ++ echo 'set Program(BitmapDir) $(PROJECT_BASE)/lib/bsvc/bitmaps' >> bsvc.tk ++ echo 'set Program(HelpDir) $(PROJECT_BASE)/lib/bsvc/help' >> bsvc.tk ++ echo 'set Program(LibDir) $(PROJECT_BASE)/lib/bsvc' >> bsvc.tk + echo 'set Program(WWWBrowser) "$(WWW_BROWSER)"' >> bsvc.tk + echo 'set Program(WWWHomePage) "$(WWW_HOME_PAGE)"' >> bsvc.tk + echo 'set Program(StopIndicator) C:\\BSVC\\bin\\STOP' >> bsvc.tk + echo 'if {$$tcl_version >= 7.5 && $$tcl_platform(platform) == "windows"} {' >> bsvc.tk +- echo ' option readfile $$Program(InstallDir)/UI/bsvc.win 40' >> bsvc.tk ++ echo ' option readfile $(PROJECT_BASE)/lib/bsvc/bsvc.win 40' >> bsvc.tk + echo '} else {' >> bsvc.tk +- echo ' option readfile $$Program(InstallDir)/UI/bsvc.ad 40' >> bsvc.tk ++ echo ' option readfile $(PROJECT_BASE)/lib/bsvc/bsvc.ad 40' >> bsvc.tk + echo '}' >> bsvc.tk +- echo 'source $$Program(InstallDir)/UI/main.tk' >> bsvc.tk ++ echo 'source $(PROJECT_BASE)/lib/bsvc/main.tk' >> bsvc.tk + + install: bsvc bsvc.tk +- $(MKDIR) $(INSTALL_DIR)/UI +- $(MKDIR) $(INSTALL_DIR)/UI/bitmaps +- $(MKDIR) $(INSTALL_DIR)/UI/help +- $(INSTALL) *.tk *.ad $(INSTALL_DIR)/UI +- $(INSTALL) bitmaps/* $(INSTALL_DIR)/UI/bitmaps +- $(INSTALL) help/* $(INSTALL_DIR)/UI/help ++ $(MKDIR) $(PROJECT_BASE)/lib/bsvc ++ $(MKDIR) $(PROJECT_BASE)/lib/bsvc/bitmaps ++ $(MKDIR) $(PROJECT_BASE)/lib/bsvc/help ++ $(INSTALL) *.tk *.ad $(PROJECT_BASE)/lib/bsvc ++ $(INSTALL) bitmaps/* $(PROJECT_BASE)/lib/bsvc/bitmaps ++ $(INSTALL) help/* $(PROJECT_BASE)/lib/bsvc/help + $(INSTALL) bsvc $(INSTALL_DIR) + diff --git a/emulators/bsvc/files/patch-ag b/emulators/bsvc/files/patch-ag new file mode 100644 index 000000000000..719a3a5e0ded --- /dev/null +++ b/emulators/bsvc/files/patch-ag @@ -0,0 +1,11 @@ +--- sim68000/cpu/Makefile.orig Mon Sep 6 21:46:13 1999 ++++ sim68000/cpu/Makefile Mon Sep 6 21:46:36 1999 +@@ -28,7 +28,7 @@ + $(CC) $(INCLUDES) -o instruction instruction.c + + m68000DecodeTable.hxx: instruction instruction.list +- $(PROJECT_BASE)/src/sim68000/cpu/instruction ++ $(WRKSRC)/sim68000/cpu/instruction + + clean: + rm -f *.o $(LIBRARY) instruction diff --git a/emulators/bsvc/files/patch-ah b/emulators/bsvc/files/patch-ah new file mode 100644 index 000000000000..e24fb45bd13b --- /dev/null +++ b/emulators/bsvc/files/patch-ah @@ -0,0 +1,11 @@ +--- sim68360/cpu/Makefile.orig Mon Sep 6 21:47:20 1999 ++++ sim68360/cpu/Makefile Mon Sep 6 21:47:39 1999 +@@ -31,7 +31,7 @@ + $(CC) $(INCLUDES) -o instruction instruction.c + + cpu32DecodeTable.hxx: instruction instruction.list +- $(PROJECT_BASE)/src/sim68360/cpu/instruction ++ $(WRKSRC)/sim68360/cpu/instruction + + clean: + rm -f *.o $(LIBRARY) instruction diff --git a/emulators/bsvc/pkg-plist b/emulators/bsvc/pkg-plist index c81597cb3271..ebb7ddeb0919 100644 --- a/emulators/bsvc/pkg-plist +++ b/emulators/bsvc/pkg-plist @@ -2,7 +2,10 @@ bin/68kasm bin/xtermpipe bin/bsvc bin/sim68000 +bin/sim68360 lib/bsvc/bitmaps/Down.xbm +lib/bsvc/bitmaps/bsvc.gif +lib/bsvc/bitmaps/bspin.gif lib/bsvc/bitmaps/wait2.xbm lib/bsvc/bitmaps/wait1.xbm lib/bsvc/bitmaps/wait0.xbm @@ -10,8 +13,6 @@ lib/bsvc/bitmaps/wait.xbm lib/bsvc/bitmaps/memicon.xbm lib/bsvc/bitmaps/listicon.xbm lib/bsvc/bitmaps/bsvcicon.xbm -lib/bsvc/bitmaps/bsvc.xbm -lib/bsvc/bitmaps/b-logo.gif lib/bsvc/bitmaps/Up.xbm lib/bsvc/bitmaps/PageUp.xbm lib/bsvc/bitmaps/PageDown.xbm |