diff options
| author | jwise <jwise@pkgsrc.org> | 2000-08-31 00:11:31 +0000 |
|---|---|---|
| committer | jwise <jwise@pkgsrc.org> | 2000-08-31 00:11:31 +0000 |
| commit | 6a261465eba3264b12695c61fffb86ed1baa7d55 (patch) | |
| tree | ade090fa539b2b87faad34b224baf987dcda4cce | |
| parent | a47b3b7dd40fd2993180eb2657f382e1fa64d286 (diff) | |
| download | pkgsrc-6a261465eba3264b12695c61fffb86ed1baa7d55.tar.gz | |
Adapt this for tk-8.3.2, and fix for case where built as non-root (but installed
as root).
| -rw-r--r-- | mbone/rat/Makefile | 10 | ||||
| -rw-r--r-- | mbone/rat/files/patch-sum | 4 | ||||
| -rw-r--r-- | mbone/rat/patches/patch-ah | 8 |
3 files changed, 12 insertions, 10 deletions
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile index afff3e75346..914b9663810 100644 --- a/mbone/rat/Makefile +++ b/mbone/rat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2000/08/18 22:46:42 hubertf Exp $ +# $NetBSD: Makefile,v 1.15 2000/08/31 00:11:31 jwise Exp $ # DISTNAME= rat-3.0.28 @@ -8,7 +8,7 @@ MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/3.0.28/ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/ -DEPENDS+= tk-8.0.5:../../x11/tk80 +DEPENDS+= tk-8.3.2:../../x11/tk RESTRICTED= "Contains DES encryption" NO_SRC_ON_FTP= ${RESTRICTED} @@ -17,13 +17,15 @@ NO_SRC_ON_CDROM= ${RESTRICTED} USE_GMAKE= yes USE_X11BASE= yes +USER= build + do-build: - cd ${WRKSRC} && PREFIX=${PREFIX} MAKE=${MAKE_PROGRAM} LDFLAGS="${LDFLAGS}" X11BASE=${X11BASE} LOCALBASE=${LOCALBASE} ./Build rat + cd ${WRKSRC} && USER=${USER} PREFIX=${PREFIX} MAKE=${MAKE_PROGRAM} LDFLAGS="${LDFLAGS}" X11BASE=${X11BASE} LOCALBASE=${LOCALBASE} ./Build rat do-install: cd ${WRKSRC} && ( \ ${INSTALL_PROGRAM} \ - bin/$${USER:=`whoami`}/rat-${OPSYS}-${OS_VERSION} \ + bin/${USER}/rat-${OPSYS}-${OS_VERSION} \ ${PREFIX}/bin/rat; \ ${INSTALL_MAN} \ man/man1/rat.1 ${PREFIX}/man/man1/rat.1 ) diff --git a/mbone/rat/files/patch-sum b/mbone/rat/files/patch-sum index 670e4815ea1..1e5c059537a 100644 --- a/mbone/rat/files/patch-sum +++ b/mbone/rat/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.4 1999/12/12 08:21:58 rh Exp $ +$NetBSD: patch-sum,v 1.5 2000/08/31 00:11:32 jwise Exp $ MD5 (patch-aa) = 0dd446f89f9d481357b65165acb44f8f MD5 (patch-ab) = 8c9c6dfe8563fbfaf2df1323e7c56478 @@ -7,4 +7,4 @@ MD5 (patch-ad) = 9e0284f02699d024517cdce8cdd50ec3 MD5 (patch-ae) = f64f47b318e4881dfcf9ed79bf62d89b MD5 (patch-af) = 21d121d8043ba843c7d1e5d3b550cf89 MD5 (patch-ag) = 96f02ec6c60b9fb795a33a6edadb02b2 -MD5 (patch-ah) = 8681adf7a3b96df92e7dac453dd4786f +MD5 (patch-ah) = 4dab35facc70597ae2a04059605ca0b3 diff --git a/mbone/rat/patches/patch-ah b/mbone/rat/patches/patch-ah index bd4085431e6..ed28f2a12a5 100644 --- a/mbone/rat/patches/patch-ah +++ b/mbone/rat/patches/patch-ah @@ -1,12 +1,12 @@ -$NetBSD: patch-ah,v 1.2 1998/11/05 02:46:09 mycroft Exp $ +$NetBSD: patch-ah,v 1.3 2000/08/31 00:11:32 jwise Exp $ --- /dev/null Wed Nov 4 21:26:51 1998 +++ Makefile_NetBSD_1 Wed Nov 4 21:27:04 1998 @@ -0,0 +1,7 @@ +INCS = -I${X11BASE}/include \ -+ -I${LOCALBASE}/include/tcl8.0 \ -+ -I${LOCALBASE}/include/tk8.0 -+LDLIBS = -L${LOCALBASE}/lib -ltk80 -ltcl80 \ ++ -I${LOCALBASE}/include \ ++ -I${LOCALBASE}/include ++LDLIBS = -L${LOCALBASE}/lib -ltk83 -ltcl83 \ + -L${X11BASE}/lib -lXext -lX11 \ + -lm + |