Fix use of _OPSYS_RPATH_NAME causing broken compiler.

Bump PKG_REVISION.

7 files changed, 47 insertions, 55 deletions

diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 091fd3f38b6..bf9e30e9cb8 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/03/10 06:25:35 jmc Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/29 23:40:02 jtb Exp $
 
 DISTNAME=		sather-1.2.1
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=sather/}
 
@@ -17,33 +18,36 @@ MAKE_ENV+=		_OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME}
 
 INFO_FILES=		sather.info sather-tutorial.info sather-mode.info
 
+REPLACE_PERL=		${WRKSRC}/Browser/Web/ps2gif
+
 do-configure:
-	for f in							\
-		${WRKSRC}/Boot/sacomp.code/Makefile			\
-		${WRKSRC}/Library/System/unix.sa			\
-		${WRKSRC}/System/Common/CONFIG.proto			\
-		${WRKSRC}/System/Platforms/netbsd/CONFIG		\
-		${WRKSRC}/System/Platforms/X/Platform.module		\
-		${WRKSRC}/debian/bin-wrapper				\
-		${WRKSRC}/Browser/Web/convert-1.1			\
-		${WRKSRC}/Browser/Web/gen_html_class_index		\
-		${WRKSRC}/Browser/Web/gen_html_sa_files			\
-		${WRKSRC}/Browser/Web/gen_html_shortflat		\
-		${WRKSRC}/Browser/Web/gen_html_top_level		\
-		${WRKSRC}/Browser/Web/gen_mml_sa_files			\
-		${WRKSRC}/Browser/Web/gen_mml_shortflat			\
-		${WRKSRC}/Browser/Web/graph2dot;			\
-	do								\
-		${SED}	-e 's:@CC@:${CC}:g'				\
-			-e 's:@CFLAGS@:${CFLAGS}:g'			\
-			-e 's:@GMAKE@:${GMAKE}:g'			\
-			-e 's:@PREFIX@:${PREFIX}:g'			\
-			-e 's:@X11BASE@:${X11BASE}:g'			\
-			-e 's:@GC_PREFIX@:${BUILDLINK_PREFIX.boehm-gc}:g' \
-			-e 's:@TCL_PREFIX@:${BUILDLINK_PREFIX.tcl}:g'	\
-			-e 's:@TK_PREFIX@:${BUILDLINK_PREFIX.tk}:g'	\
-			$$f > $$f.tmp;					\
-		${MV} -f $$f.tmp $$f;					\
+	for f in								\
+		${WRKSRC}/Boot/sacomp.code/Makefile				\
+		${WRKSRC}/Library/System/unix.sa				\
+		${WRKSRC}/System/Common/CONFIG.proto				\
+		${WRKSRC}/System/Platforms/netbsd/CONFIG			\
+		${WRKSRC}/System/Platforms/X/Platform.module			\
+		${WRKSRC}/debian/bin-wrapper					\
+		${WRKSRC}/Browser/Web/convert-1.1				\
+		${WRKSRC}/Browser/Web/gen_html_class_index			\
+		${WRKSRC}/Browser/Web/gen_html_sa_files				\
+		${WRKSRC}/Browser/Web/gen_html_shortflat			\
+		${WRKSRC}/Browser/Web/gen_html_top_level			\
+		${WRKSRC}/Browser/Web/gen_mml_sa_files				\
+		${WRKSRC}/Browser/Web/gen_mml_shortflat				\
+		${WRKSRC}/Browser/Web/graph2dot;				\
+	do									\
+		${SED}	-e 's:@CC@:${CC}:g'					\
+			-e 's:@CFLAGS@:${CFLAGS}:g'				\
+			-e 's:@GMAKE@:${GMAKE}:g'				\
+			-e 's:@PREFIX@:${PREFIX}:g'				\
+			-e 's:@X11BASE@:${X11BASE}:g'				\
+			-e 's:@GC_PREFIX@:${BUILDLINK_PREFIX.boehm-gc}:g'	\
+			-e 's:@TCL_PREFIX@:${BUILDLINK_PREFIX.tcl}:g'		\
+			-e 's:@TK_PREFIX@:${BUILDLINK_PREFIX.tk}:g'		\
+			-e 's:@_OPSYS_RPATH_NAME@:${_OPSYS_RPATH_NAME}:g'	\
+			$$f > $$f.tmp;						\
+		${MV} -f $$f.tmp $$f;						\
 	done
 
 post-build:
@@ -51,6 +55,9 @@ post-build:
 		${MAKEINFO} sather-tutorial.texinfo; 			\
 		${MAKEINFO} sather-mode.texinfo
 
+post-install:
+	${RM} -fr ${WRKSRC}/System/Platforms/dualgui/dual_gui_server.code
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/sather
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/sather/Bin
@@ -81,10 +88,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Emacs/*.el ${PREFIX}/share/emacs/site-lisp
 
-# should fix this
-post-install:
-	${RM} -fr ${PREFIX}/lib/sather/System/Platforms/dualgui/dual_gui_server.code/
-
 .include "../../devel/boehm-gc/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
 
diff --git a/lang/sather/distinfo b/lang/sather/distinfo
index b8612a24c60..935926363ab 100644
--- a/lang/sather/distinfo
+++ b/lang/sather/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.2 2003/03/10 06:25:35 jmc Exp $
+$NetBSD: distinfo,v 1.3 2003/04/29 23:40:02 jtb Exp $
 
 SHA1 (sather-1.2.1.tar.gz) = 434f6b9c69d63a022c83f3693011415ad9730cb1
 Size (sather-1.2.1.tar.gz) = 4458088 bytes
 SHA1 (patch-aa) = d326038193ce2fb459ed19f9ab2ae2b6dce1ace3
 SHA1 (patch-ab) = e45f8a8230d1fbe3fc72babbecfa8148699f7906
 SHA1 (patch-ac) = 586cdebde7a2c1b49f9b75a33d26980a2c0397f3
-SHA1 (patch-ad) = 3d4f6030eb0928d4569a57d72087d34291da836a
+SHA1 (patch-ad) = 96a1fc6948a46826dbca52825a9d796bc80d8620
 SHA1 (patch-ae) = c1aed9437daf2a03303f06850700f40a91da4a17
-SHA1 (patch-af) = 752b27b4b6edd7cf3b3267434e8e6ff3e002e040
-SHA1 (patch-ag) = 00a9a8ed0085998c8ee89a188ace4915a00065d1
+SHA1 (patch-af) = 374d9e854a29c33b004a3062bf2fe6f97e568d9b
+SHA1 (patch-ag) = c319a48f31a751b320b68967105ce15d7300a5ca
 SHA1 (patch-ah) = 9dad48a3bc7e6af65eb51ae6070b8e67cab9ca2b
-SHA1 (patch-ai) = a69d416dfff2d1efbfcb4b23b2730cdc644dda57
+SHA1 (patch-ai) = 93b1a0f2a932c9f0024fbf795eae9cdb0dd6f534
 SHA1 (patch-aj) = f9f4d36335fe4c20fa01f4ff6cba59edeb0deab7
 SHA1 (patch-ak) = 9efae5b96d5e8b8040d74eebc20b3aa7153d2aee
 SHA1 (patch-al) = 52d12bc03d041dfa28140842f46a423644952a91
@@ -21,7 +21,6 @@ SHA1 (patch-ap) = 5fedfb90a13d36406486d1d86bbcf0a22a0e19a5
 SHA1 (patch-aq) = 82dd99ac9741766fb010764353451f990b027f58
 SHA1 (patch-ar) = 7add10b00c76179d864405f81b984fc38a185a2c
 SHA1 (patch-as) = 8970360fdae89308baacbf5beb39b62c7137d4cc
-SHA1 (patch-at) = 325b0ea26c047ba2bff212f541d3e27c192fa3db
 SHA1 (patch-au) = c014dc73d0dae3f777ecf18380efce7478147550
 SHA1 (patch-av) = 89573de88e99140dfb7fdae226646e40792a5752
 SHA1 (patch-aw) = 87dbb259e058d7f246b523b8b4e101b02435c004
diff --git a/lang/sather/patches/patch-ad b/lang/sather/patches/patch-ad
index df808219bd7..6fe09a52aae 100644
--- a/lang/sather/patches/patch-ad
+++ b/lang/sather/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/04 00:45:34 jtb Exp $
+$NetBSD: patch-ad,v 1.2 2003/04/29 23:40:02 jtb Exp $
 
 --- /dev/null	Thu May  2 17:26:15 2002
 +++ System/Platforms/netbsd/CONFIG	Thu May  2 17:34:27 2002
 @@ -0,0 +1 @@
-+CC_OPTIONS:	"-I@X11BASE@/include -I@TCL_PREFIX@/include -I@TK_PREFIX@/include -R@X11BASE@/lib -L@X11BASE@/lib -R@TCL_PREFIX@/lib -L@TCL_PREFIX@/lib -R@TK_PREFIX@/lib -L@TK_PREFIX@/lib";
++CC_OPTIONS:	"-I@X11BASE@/include -I@TCL_PREFIX@/include -I@TK_PREFIX@/include @_OPSYS_RPATH_NAME@@X11BASE@/lib -L@X11BASE@/lib @_OPSYS_RPATH_NAME@@TCL_PREFIX@/lib -L@TCL_PREFIX@/lib @_OPSYS_RPATH_NAME@@TK_PREFIX@/lib -L@TK_PREFIX@/lib";
diff --git a/lang/sather/patches/patch-af b/lang/sather/patches/patch-af
index 4152bc02069..2af2297cfd2 100644
--- a/lang/sather/patches/patch-af
+++ b/lang/sather/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2003/03/10 06:25:36 jmc Exp $
+$NetBSD: patch-af,v 1.3 2003/04/29 23:40:03 jtb Exp $
 
 --- Boot/sacomp.code/Makefile.orig	Thu Nov  4 08:04:49 1999
 +++ Boot/sacomp.code/Makefile
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.2 2003/03/10 06:25:36 jmc Exp $
 +CC     = @CC@
  HDR    =sather.h tags.h
 -LIBS   = -lgc -lm
-+LIBS   = -L@GC_PREFIX@/lib -Wl,${_OPSYS_RPATH_NAME}@GC_PREFIX@/lib -lgc -lm
++LIBS   = -L@GC_PREFIX@/lib -Wl,@_OPSYS_RPATH_NAME@@GC_PREFIX@/lib -lgc -lm
  CS     =sacomp
  OBJ    = a_stackA_STACK2014955575.o am_outAM_OUT1363671444.o am_outAM_OUT1363671444x.o arefFSETAM_ROU1518004496.o arefFSETIMMUTA2116029667.o arefFSETTUPSIG268064465.o arrayARRAYAM_I1084914261.o arrayARRAYTUPI1927875024.o as_outAS_OUT1429002792.o as_outAS_OUT1429002792x.o cgenCGEN1354269066.o cgenCGEN1354269066x.o cgenCGEN1354269066xx.o cgenCGEN1354269066xxx.o cgenCGEN1354269066xxxx.o cgenCGEN1354269066xxxxx.o cgenCGEN1354269066xxxxxx.o cgenCGEN1354269066xxxxxxx.o cgenCGEN1354269066xxxxxxxx.o cgenCGEN1354269066xxxxxxxxx.o cgenCGEN1354269066xxxxxxxxxx.o code_fileCODE_372141741.o configCONFIG_R422014871.o cs_optionsCS_O301318552.o cs_optionsCS_O301318552x.o cursorAM_CURSO1314676474.o cursorAM_CURSO1314676474x.o cursorAM_CURSO1314676474xx.o cursorAM_CURSO1314676474xxx.o dispatch.o eltELT742463773.o elt_algELT_ALG1548486913.o elt_algELT_ALG241706736.o elt_algELT_ALG433952755.o elt_algELT_ALG656599769.o elt_algELT_ALG987448979.o flistFLISTAM_C1171004157.o flistFLISTTUPA253333040.o fmapFMAPAM_ROU1000508936.o fmapFMAPSTRFSE258056667.o fmapFMAPdTPCOD1051074108.o generate_amGEN60284023.o get_optionsCOD183550016.o globals.o get_optionsCOD183550016x.o implIMPL_CREAT99472218.o inlineINLINE_I1557365391.o intiINTI1462257232.o layoutCLASS_LA1330944056.o mangleMANGLE1705139666.o mangleNAMESPAC760510184.o o_localOPT_LOC907909712.o o_localOPT_LOC907909712x.o optimizeOPT_CO1177876774.o optimizeOPT_IT1193060919.o parsePARSER311504339.o parsePARSER311504339x.o parsePARSER311504339xx.o parsePARSER311504339xxx.o parsePARSER311504339xxxx.o progPROG_AS_TB824135997.o scanSCANNER1990933774.o side_effectSE_411721069.o strings.o stringsx.o stringsxx.o system.o stmtAM_FORK_ST1674905658.o tpTP_BUILTIN1142074570.o tpTP_ITER145455607.o transTRANS2123847391.o transTRANS2123847391x.o transTRANS2123847391xx.o transTRANS2123847391xxx.o transTRANS2123847391xxxx.o tupTUPAM_CURSO1313579705.o unbox.o unixUNIX1766692.o runtime.o
  OTHER  =
diff --git a/lang/sather/patches/patch-ag b/lang/sather/patches/patch-ag
index fee2c4f723c..23b50a626fa 100644
--- a/lang/sather/patches/patch-ag
+++ b/lang/sather/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2003/03/10 06:25:36 jmc Exp $
+$NetBSD: patch-ag,v 1.3 2003/04/29 23:40:03 jtb Exp $
 
 --- System/Common/CONFIG.proto.orig	Wed Nov  3 18:48:17 1999
 +++ System/Common/CONFIG.proto
@@ -13,7 +13,7 @@ $NetBSD: patch-ag,v 1.2 2003/03/10 06:25:36 jmc Exp $
 +VERSION:		"1.2.1";
 +C_COMPILER:		"@CC@";
 +CC_OPTIONS:		"-I@GC_PREFIX@/include";
-+GC_LINK:		"-L@GC_PREFIX@/lib -Wl,${_OPSYS_RPATH_NAME}@GC_PREFIX@/lib -lgc";
++GC_LINK:		"-L@GC_PREFIX@/lib -Wl,@_OPSYS_RPATH_NAME@@GC_PREFIX@/lib -lgc";
  LINK_OPTIONS:		"-lm";
 -MAKE_COMMAND:		"make";
 +MAKE_COMMAND:		"@GMAKE@";
diff --git a/lang/sather/patches/patch-ai b/lang/sather/patches/patch-ai
index f5c60ea0d7a..7f8ffede95f 100644
--- a/lang/sather/patches/patch-ai
+++ b/lang/sather/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/05/04 00:45:36 jtb Exp $
+$NetBSD: patch-ai,v 1.2 2003/04/29 23:40:03 jtb Exp $
 
 --- System/Platforms/X/Platform.module.orig	Thu May  2 17:18:27 2002
 +++ System/Platforms/X/Platform.module	Thu May  2 17:19:33 2002
@@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2002/05/04 00:45:36 jtb Exp $
  -- -C_flag -lm
  
 --C_flag -L/usr/X11R6/lib/           -- Expected to contain libX11.a
-+-C_flag "-R@X11BASE@/lib -L@X11BASE@/lib"  -- Expected to contain libX11.a
++-C_flag "@_OPSYS_RPATH_NAME@@X11BASE@/lib -L@X11BASE@/lib"  -- Expected to contain libX11.a
  -C_flag -lX11 
  
  
diff --git a/lang/sather/patches/patch-at b/lang/sather/patches/patch-at
deleted file mode 100644
index 9770d85623d..00000000000
--- a/lang/sather/patches/patch-at
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-at,v 1.1.1.1 2002/05/04 00:45:37 jtb Exp $
-
---- Browser/Web/ps2gif.orig	Thu Jul 22 18:56:01 1999
-+++ Browser/Web/ps2gif	Thu May  2 19:27:58 2002
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
- # ps2gif.pl
- #
- # THIS FILE IS COPYRIGHT 1994 BY TELENOR RESEARCH, NORWAY