diff options
Diffstat (limited to 'lang/sather')
-rw-r--r-- | lang/sather/Makefile | 6 | ||||
-rw-r--r-- | lang/sather/distinfo | 8 | ||||
-rw-r--r-- | lang/sather/patches/patch-ad | 4 | ||||
-rw-r--r-- | lang/sather/patches/patch-af | 4 | ||||
-rw-r--r-- | lang/sather/patches/patch-ag | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/lang/sather/Makefile b/lang/sather/Makefile index fd8ff606da3..f82f7fa942c 100644 --- a/lang/sather/Makefile +++ b/lang/sather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/07/18 10:49:49 recht Exp $ +# $NetBSD: Makefile,v 1.20 2004/08/27 18:52:00 jlam Exp $ DISTNAME= sather-1.2.1 PKGREVISION= 4 @@ -14,7 +14,6 @@ USE_X11= # defined USE_GNU_TOOLS+= make ALL_TARGET= full optional -MAKE_ENV+= _OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME} USE_MAKEINFO= YES INFO_FILES= sather.info sather-tutorial.info sather-mode.info @@ -48,7 +47,8 @@ SUBST_SED.sather-configure= \ -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' + -e 's:@LINKER_RPATH_FLAG@:${LINKER_RPATH_FLAG}:g' \ + -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' post-build: cd ${WRKSRC}/Emacs; ${MAKEINFO} sather.texinfo; \ diff --git a/lang/sather/distinfo b/lang/sather/distinfo index a2826125010..9f134d7594e 100644 --- a/lang/sather/distinfo +++ b/lang/sather/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.4 2004/01/13 20:56:31 kristerw Exp $ +$NetBSD: distinfo,v 1.5 2004/08/27 18:52:00 jlam 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) = 96a1fc6948a46826dbca52825a9d796bc80d8620 +SHA1 (patch-ad) = 687a05fe5d20757e82a366f04c9c3905f14b5271 SHA1 (patch-ae) = c1aed9437daf2a03303f06850700f40a91da4a17 -SHA1 (patch-af) = 374d9e854a29c33b004a3062bf2fe6f97e568d9b -SHA1 (patch-ag) = c319a48f31a751b320b68967105ce15d7300a5ca +SHA1 (patch-af) = 601bd3f55f16917d525c29813c23999264c883e2 +SHA1 (patch-ag) = c16f121bac6197284eef907c96e9f903b35835b2 SHA1 (patch-ah) = 9dad48a3bc7e6af65eb51ae6070b8e67cab9ca2b SHA1 (patch-ai) = 93b1a0f2a932c9f0024fbf795eae9cdb0dd6f534 SHA1 (patch-aj) = f9f4d36335fe4c20fa01f4ff6cba59edeb0deab7 diff --git a/lang/sather/patches/patch-ad b/lang/sather/patches/patch-ad index 6fe09a52aae..f166f7419e3 100644 --- a/lang/sather/patches/patch-ad +++ b/lang/sather/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.2 2003/04/29 23:40:02 jtb Exp $ +$NetBSD: patch-ad,v 1.3 2004/08/27 18:52:00 jlam 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 @_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"; ++CC_OPTIONS: "-I@X11BASE@/include -I@TCL_PREFIX@/include -I@TK_PREFIX@/include @LINKER_RPATH_FLAG@ @X11BASE@/lib -L@X11BASE@/lib @LINKER_RPATH_FLAG@ @TCL_PREFIX@/lib -L@TCL_PREFIX@/lib @LINKER_RPATH_FLAG@ @TK_PREFIX@/lib -L@TK_PREFIX@/lib"; diff --git a/lang/sather/patches/patch-af b/lang/sather/patches/patch-af index 2af2297cfd2..94a2c7c796d 100644 --- a/lang/sather/patches/patch-af +++ b/lang/sather/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.3 2003/04/29 23:40:03 jtb Exp $ +$NetBSD: patch-af,v 1.4 2004/08/27 18:52:00 jlam 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.3 2003/04/29 23:40:03 jtb 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 @COMPILER_RPATH_FLAG@@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 23b50a626fa..88f1bc65ccf 100644 --- a/lang/sather/patches/patch-ag +++ b/lang/sather/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.3 2003/04/29 23:40:03 jtb Exp $ +$NetBSD: patch-ag,v 1.4 2004/08/27 18:52:00 jlam 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.3 2003/04/29 23:40:03 jtb 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 @COMPILER_RPATH_FLAG@@GC_PREFIX@/lib -lgc"; LINK_OPTIONS: "-lm"; -MAKE_COMMAND: "make"; +MAKE_COMMAND: "@GMAKE@"; |