diff options
| author | is <is@pkgsrc.org> | 2005-03-08 13:49:49 +0000 |
|---|---|---|
| committer | is <is@pkgsrc.org> | 2005-03-08 13:49:49 +0000 |
| commit | 2fa05f5cff6a03c4cbcd07390a61eb61a21a1ea1 (patch) | |
| tree | cb0fd090f114ce0cc157fb697213ebcbe8566c19 /lang/sr | |
| parent | eb5a870a149db8a2fe9006d9b9eb22afeba6b4e6 (diff) | |
| download | pkgsrc-2fa05f5cff6a03c4cbcd07390a61eb61a21a1ea1.tar.gz | |
sr-2.3.3nb2: create correct X11 linking instructions.
Diffstat (limited to 'lang/sr')
| -rw-r--r-- | lang/sr/Makefile | 16 | ||||
| -rw-r--r-- | lang/sr/distinfo | 4 | ||||
| -rw-r--r-- | lang/sr/patches/patch-aa | 15 |
3 files changed, 21 insertions, 14 deletions
diff --git a/lang/sr/Makefile b/lang/sr/Makefile index eecccdd8c2d..2280ffed3a9 100644 --- a/lang/sr/Makefile +++ b/lang/sr/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2005/03/02 13:47:45 is Exp $ +# $NetBSD: Makefile,v 1.6 2005/03/08 13:49:49 is Exp $ # DISTNAME= sr233 PKGNAME= sr-2.3.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang parallel MASTER_SITES= ftp://ftp.cs.arizona.edu/sr/ EXTRACT_SUFX= .tar.Z @@ -22,10 +22,14 @@ USE_BUILDLINK3= yes TEST_TARGET= verify pre-configure: - ${MV} ${WRKSRC}/Configuration ${WRKSRC}/Configuration.template - ${SED} -e 's,_LOCALBASE_,${LOCALBASE},' \ - -e 's,_WRKSRC_,${WRKSRC},' \ - ${WRKSRC}/Configuration.template > ${WRKSRC}/Configuration + ${MV} ${WRKSRC}/Configuration \ + ${WRKSRC}/Configuration.template + ${SED} -e 's,_LOCALBASE_,${LOCALBASE},g' \ + -e 's,_WRKSRC_,${WRKSRC},g' \ + -e 's,_XINC_,${X11BASE}/include,g' \ + -e 's,_XLIB_,${X11BASE}/lib,g' \ + ${WRKSRC}/Configuration.template \ + > ${WRKSRC}/Configuration pre-install: -${MKDIR} ${LOCALBASE}/lib/sr diff --git a/lang/sr/distinfo b/lang/sr/distinfo index 4b49964df00..b5b3c03a6aa 100644 --- a/lang/sr/distinfo +++ b/lang/sr/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.13 2005/03/02 21:07:06 is Exp $ +$NetBSD: distinfo,v 1.14 2005/03/08 13:49:49 is Exp $ SHA1 (sr233.tar.Z) = 0354987527ed1e84c32d3b1fc6bacb65d647f337 Size (sr233.tar.Z) = 1424566 bytes -SHA1 (patch-aa) = eef6cfc94c6aa73b52d152112e9cee007fb90906 +SHA1 (patch-aa) = 8df83950498d807024f00ba806613aff99a318e9 SHA1 (patch-ab) = 2a086280fefb4acddd19cb3cbafd58f8de5b309e SHA1 (patch-ad) = 7fc00d7f52a16dc7b814c94c795bb5d7af02e58b SHA1 (patch-ar) = 9a331cdb90959d0cc7475d2fc203d2c302d4bf5c diff --git a/lang/sr/patches/patch-aa b/lang/sr/patches/patch-aa index 569b61e1c48..a16522f9dba 100644 --- a/lang/sr/patches/patch-aa +++ b/lang/sr/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2005/03/01 11:18:43 is Exp $ +$NetBSD: patch-aa,v 1.3 2005/03/08 13:49:49 is Exp $ ---- Configuration.orig 1999-08-14 01:42:02.000000000 +0200 +--- Configuration.orig 2005-01-18 16:11:10.000000000 +0000 +++ Configuration -@@ -26,13 +26,13 @@ VERSION = "SR version 2.3.2, August 1999 +@@ -26,13 +26,13 @@ VERSION = "SR version 2.3.3" # MAN5: directory in which to install the srmap/srtrace(5) man pages # (extension will be `tr 1 5` of MANEXT) @@ -39,17 +39,20 @@ $NetBSD: patch-aa,v 1.2 2005/03/01 11:18:43 is Exp $ LIBC = -LIBR = -L/usr/X11/lib -+LIBR = -L/usr/X11R6/lib ++LIBR = -R_XLIB_ -L_XLIB_ LIBM = -lm -@@ -98,7 +98,7 @@ LIBM = -lm +@@ -95,10 +95,10 @@ LIBM = -lm + # If not set, SRanimator is not built. + # + # for Sun Solaris 2.x, set XINCL = /usr/openwin/include -# for NetBSD, set XINCL = /usr/X386/include +# for NetBSD, set XINCL = /usr/X11R6/include # for Linux, set XINCL = /usr/X11/include -XINCL = /usr/include -+XINCL = /usr/X11R6/include ++XINCL = _XINC_ XTANGO = |