freebsd-ports/lang/STk/files/patch-aa

diff -cr STk-3.1/Makefile.in STk-3.1.new/Makefile.in
*** STk-3.1/Makefile.in	Wed Jul 24 12:53:04 1996
--- STk-3.1.new/Makefile.in	Tue Sep 17 15:26:07 1996
***************
*** 73,79 ****
  	@echo "SH_LDFLAGS	= @SH_LDFLAGS@"			>> config.make
  	@echo "SH_LOADER	= @SH_LOADER@"			>> config.make
  	@echo "SH_SUFFIX	= @SH_SUFFIX@"			>> config.make
! 	@echo "LIB_MALLOC	= @LIB_MALLOC@"			>> config.make
  	@echo "LIB_DLD		= @LIB_DLD@"			>> config.make
  		
  	@echo "STK_LIBRARY	= $(libdir)"			>> config.make
--- 73,79 ----
  	@echo "SH_LDFLAGS	= @SH_LDFLAGS@"			>> config.make
  	@echo "SH_LOADER	= @SH_LOADER@"			>> config.make
  	@echo "SH_SUFFIX	= @SH_SUFFIX@"			>> config.make
! 	@echo "LIB_MALLOC	= "				>> config.make
  	@echo "LIB_DLD		= @LIB_DLD@"			>> config.make
  		
  	@echo "STK_LIBRARY	= $(libdir)"			>> config.make
***************
*** 108,114 ****
  demos:
  	/bin/sh -c "(cd Demos; ../Src/test-stk -f hbrowse README.html)"
  
! install: clean-before
  	(cd Tcl;     	$(MAKE) install)
  	(cd Tk;      	$(MAKE) install)
  	(cd Mp;		$(MAKE) install)
--- 108,114 ----
  demos:
  	/bin/sh -c "(cd Demos; ../Src/test-stk -f hbrowse README.html)"
  
! install:
  	(cd Tcl;     	$(MAKE) install)
  	(cd Tk;      	$(MAKE) install)
  	(cd Mp;		$(MAKE) install)
*** STk-3.1/Tk/unix/Makefile.in	Tue Sep 17 15:47:29 1996
--- STk-3.1.new/Tk/unix/Makefile.in	Tue Sep 17 15:57:13 1996
***************
*** 75,86 ****
  # X11 include files accessible (the configure script will try to
  # set this value, and will cause it to be an empty string if the
  # include files are accessible via /usr/include).
! X11_INCLUDES =		@XINCLUDES@
  
  # Linker switch(es) to use to link with the X11 library archive (the
  # configure script will try to set this value automatically, but you
  # can override it).
! X11_LIB_SWITCHES =	@XLIBSW@
  
  # Libraries to use when linking:  must include at least Tk, Tcl, Xlib,
  # and the math library (in that order).  The "LIBS" part will be
--- 75,86 ----
  # X11 include files accessible (the configure script will try to
  # set this value, and will cause it to be an empty string if the
  # include files are accessible via /usr/include).
! X11_INCLUDES =		-I/usr/X11R6/include/
  
  # Linker switch(es) to use to link with the X11 library archive (the
  # configure script will try to set this value automatically, but you
  # can override it).
! X11_LIB_SWITCHES =	-L/usr/X11R6/lib/
  
  # Libraries to use when linking:  must include at least Tk, Tcl, Xlib,
  # and the math library (in that order).  The "LIBS" part will be
*** STk-3.1.1/configure.in.orig	Sat Mar  7 17:05:37 1998
--- STk-3.1.1/configure.in	Sat Mar  7 17:05:48 1998
***************
*** 387,393 ****
       STKLDFLAGS="$STKLDFLAGS -Wl,-E"
       LIB_DLD=-ldld;;
     FREEBSD)
!      SH_CCFLAGS="-pic"
       SH_LDFLAGS="-Bshareable -o"
       SH_LOADER="ld"
       LIB_MALLOC="-lgnumalloc"
--- 387,393 ----
       STKLDFLAGS="$STKLDFLAGS -Wl,-E"
       LIB_DLD=-ldld;;
     FREEBSD)
!      SH_CCFLAGS="-fpic"
       SH_LDFLAGS="-Bshareable -o"
       SH_LOADER="ld"
       LIB_MALLOC="-lgnumalloc"
*** STk-3.1.1/configure.orig	Sat Mar  7 17:17:50 1998
--- STk-3.1.1/configure	Sat Mar  7 17:17:59 1998
***************
*** 1536,1542 ****
       STKLDFLAGS="$STKLDFLAGS -Wl,-E"
       LIB_DLD=-ldld;;
     FREEBSD)
!      SH_CCFLAGS="-pic"
       SH_LDFLAGS="-Bshareable -o"
       SH_LOADER="ld"
       LIB_MALLOC="-lgnumalloc"
--- 1536,1542 ----
       STKLDFLAGS="$STKLDFLAGS -Wl,-E"
       LIB_DLD=-ldld;;
     FREEBSD)
!      SH_CCFLAGS="-fpic"
       SH_LDFLAGS="-Bshareable -o"
       SH_LOADER="ld"
       LIB_MALLOC="-lgnumalloc"