SHAPE - Official Patches (PATCH#2)

Wolfgang Obst wolfgang at coma.UUCP
Sat Jul 22 02:09:08 AEST 1989



Here are the second official patches for the shape-toolkit.
A very silly bug has been posted along with our first patches!

The shell archive below contains 2 files:

		sh_3.11.pat4
		vf_1.8.pat1

Apply the patches sh_3.11.pat4 within the subdirectory
.../src/shape, the patches vf_1.8.pat1 within the subdirectory
.../src/vfind using the patch(1) command.

Keep on shapin'
-Wolfgang

-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Wolfgang Obst  					TU Berlin FB-20 Sekr. FR 5-6
UUCP: {unido!}coma!wolfgang			Franklinstr. 28/29
BITNET: wolfgang at db0tui62		 	D-1000 Berlin (West) 10
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

------------------------------- CUT HERE -----------------------------------
#! /bin/sh
# This is a shell archive, meaning:
# 1. Remove everything above the #! /bin/sh line.
# 2. Save the resulting text in a file.
# 3. Execute the file with /bin/sh (not csh) to create:
#	sh_3.11.pat4
#	vf_1.8.pat1
# This archive created: Fri Jul 21 17:05:46 1989
export PATH; PATH=/bin:/usr/bin:$PATH
if test -f 'sh_3.11.pat4'
then
	echo shar: "will not over-write existing file 'sh_3.11.pat4'"
else
cat << \SHAR_EOF > 'sh_3.11.pat4'
*** misc.old	Fri Jul 21 17:16:31 1989
--- misc.c	Fri Jul 21 17:16:39 1989
***************
*** 398,404 ****
      return;
    else
      (void) (strcpy(pnt,x));
!   if (!strcmp(expandmacro("$(hosttype)","")))
      {
        (void) sprintf(attributes,"%s%s%s%s%s%d%d%d%d",
  	  buf->af_name,
--- 398,404 ----
      return;
    else
      (void) (strcpy(pnt,x));
!   if (!strcmp(expandmacro("$(hosttype)"),""))
      {
        (void) sprintf(attributes,"%s%s%s%s%s%d%d%d%d",
  	  buf->af_name,
*** version.c.old	Fri Jul 21 17:34:45 1989
--- version.c	Fri Jul 21 17:36:07 1989
***************
*** 24,27 ****
   * 		     Tel: +49-30-314-22972
   * 		     E-mail: shape at coma.uucp or shape at db0tui62.bitnet
   */
! char *version () { static char ConfID[] =  "3.11 Patchlevel_3\n\tThu Mar  9 20:51:10 MET 1989 by wolfgang at coma ";  return ConfID; }
--- 24,27 ----
   * 		     Tel: +49-30-314-22972
   * 		     E-mail: shape at coma.uucp or shape at db0tui62.bitnet
   */
! char *version () { static char ConfID[] =  "3.11 Patchlevel_4\n\tFri Jul 21 17:35:35 MET DST 1989 by wolfgang at coma ";  return ConfID; }
SHAR_EOF
fi
if test -f 'vf_1.8.pat1'
then
	echo shar: "will not over-write existing file 'vf_1.8.pat1'"
else
cat << \SHAR_EOF > 'vf_1.8.pat1'
Common subdirectories: /u/shape/shapetools/src/vfind/AFS and vfind/AFS
Common subdirectories: /u/shape/shapetools/src/vfind/PATCH and vfind/PATCH
diff -c /u/shape/shapetools/src/vfind/Shapefile vfind/Shapefile
*** /u/shape/shapetools/src/vfind/Shapefile	Mon Feb 27 17:28:43 1989
--- vfind/Shapefile	Thu Jun 15 21:03:28 1989
***************
*** 65,70 ****
--- 65,71 ----
  
  vclass system ::= (bsd_4_3, sunos_4_0, ultrix_2_0)
  vclass compiler ::= (pcc, gcc)
+ vclass foo ::= (pcc, maxoptimize) # do not mix pcc and maxoptimize
  #
  #
  cfflags:
***************
*** 85,91 ****
  #
  pcc:
  	CC=cc $(INCLUDES)
! gnu:
  	CC=gcc -traditional 
  	CFLAGS=-g -fwritable-strings $(INCLUDES)
  #
--- 86,92 ----
  #
  pcc:
  	CC=cc $(INCLUDES)
! gcc:
  	CC=gcc -traditional 
  	CFLAGS=-g -fwritable-strings $(INCLUDES)
  #
***************
*** 119,181 ****
  MANUALS = vfind.1
  INCLUDES = -I$(AFSINC)
  
! .BPOOL:
  #.NOBPOOL:
  
  vfind: $(RULE) +cfflags +$(SYSTEM) +$(COMPILER) +$(QUALITY) $(LIBS) $(OBJECTS)
  	$(CC) $(LDFLAGS) -o vfind $(OBJECTS) $(LIBS)
  
! preprel: rel @newrel @publish
  
- comprel: rel vfind
- 
- 
  lint: +$(SYSTEM) +$(COMPILER) +$(QUALITY) +$(PURITY) $(COMPONENTS)
  	lint $(CFLAGS) $(INCLUDES) $(COMPONENTS)
  
- VERSIONPROTO = /u/shape/lib/version.c
- vfversion.o: $(VERSIONPROTO)
- vfind.o: atk.h
- 
- #
- # Metatargets
- #
- @save:
- 	save -q $(COMPONENTS)
- 
- @publish:
- 	sbmt -q $(COMPONENTS) -n $(RELNAME)
- 
- @newrel:
- 	cp $(VERSIONPROTO) vfversion.c ; \
- 	sbmt -fq vfversion.c
- 
- @sunset: $(COMPONENTS)
- 	rsh troll '(cd vfind; rm -f $(COMPONENTS) )';
- 	rcp $(COMPONENTS) troll:vfind;
- 	rsh troll '(set path = ($$path /usr/gnu/bin) ;cd vfind; /u/shape/bin/shape SYSTEM=sunos_4_0)'
- 
- @suninstall: vsave $(COMPONENTS)
- 	rsh troll '(cd vfind; rm -f $(COMPONENTS) )';
- 	rcp $(COMPONENTS) troll:vfind;
- 	rsh troll '(set path = ($$path /usr/gnu/bin) ;cd vfind; /u/shape/bin/shape SYSTEM=sunos_4_0)'
- 
- @vaxset: $(COMPONENTS)
- 	rsh chaos '(cd vfind; rm -f $(COMPONENTS) )';
- 	rcp $(COMPONENTS) chaos:vfind;
- 	rsh chaos '(set path = ($$path /usr/local) ;cd vfind; /u/shape/bin/shape SYSTEM=ultrix_2_0)'
- 
- @bclean:
- 	rm -f AFS/?B*
- 
- install: rel vfind
- 	@echo installing vfind in $(INSTALDIR); \
- 	install -c -m 755 vfind $(INSTALDIR)
- 
- @nothing:
- 
- @echocomp:
- 	@echo $(COMPONENTS)
- 
  tags:
  	etags $(SOURCES) $(HEADERS)
--- 120,139 ----
  MANUALS = vfind.1
  INCLUDES = -I$(AFSINC)
  
! .BPOOL: 		# nothing goes into binary pool
  #.NOBPOOL:
  
  vfind: $(RULE) +cfflags +$(SYSTEM) +$(COMPILER) +$(QUALITY) $(LIBS) $(OBJECTS)
  	$(CC) $(LDFLAGS) -o vfind $(OBJECTS) $(LIBS)
  
! install: $(RULE) vfind
! 	@echo installing vfind in $(INSTALDIR); \
! 	install -c -m 755 vfind $(INSTALDIR)
  
  lint: +$(SYSTEM) +$(COMPILER) +$(QUALITY) +$(PURITY) $(COMPONENTS)
  	lint $(CFLAGS) $(INCLUDES) $(COMPONENTS)
  
  tags:
  	etags $(SOURCES) $(HEADERS)
+ 
+ vfind.o: atk.h
diff -c /u/shape/shapetools/src/vfind/vfversion.c vfind/vfversion.c
*** /u/shape/shapetools/src/vfind/vfversion.c	Mon Feb 27 17:23:47 1989
--- vfind/vfversion.c	Thu Jun 15 21:36:48 1989
***************
*** 28,33 ****
   *  Prototype version procedure
   */
  char *vfversion () { 
!   static char ConfID[] =  "1.8 (Tue Feb 21 17:02:07 1989 by uli at coma)";
    return ConfID;
  }
--- 28,33 ----
   *  Prototype version procedure
   */
  char *vfversion () { 
!   static char ConfID[] =  "1.8 Patchlevel_1\n\t(Thu Jun 15 21:32:10 MET DST 1989 by uli at coma)";
    return ConfID;
  }
SHAR_EOF
fi
exit 0
#	End of shell archive



More information about the Comp.sources.bugs mailing list