diff options
author | jmmv <jmmv@pkgsrc.org> | 2009-03-05 09:59:12 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2009-03-05 09:59:12 +0000 |
commit | 476e25c10b65607d188c801b2400f97d5b53af0f (patch) | |
tree | 4c5dabbf1ba76556043b7c3cf8e2393e89722fee /misc | |
parent | 7c1f20624fdff91fc5f75ffbdda462275f95344f (diff) | |
download | pkgsrc-476e25c10b65607d188c801b2400f97d5b53af0f.tar.gz |
Fix destdir support by defining PKG_DESTDIR_SUPPORT early enough and by
not setting setuid permissions too early.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/screen/Makefile | 6 | ||||
-rw-r--r-- | misc/screen/distinfo | 4 | ||||
-rw-r--r-- | misc/screen/patches/patch-an | 16 |
3 files changed, 15 insertions, 11 deletions
diff --git a/misc/screen/Makefile b/misc/screen/Makefile index b2ca7d078d2..d0427db9832 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2009/03/02 21:11:49 adrianp Exp $ +# $NetBSD: Makefile,v 1.79 2009/03/05 09:59:12 jmmv Exp $ DISTNAME= screen-4.0.3 PKGREVISION= 2 @@ -12,11 +12,11 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.gnu.org/software/screen/screen.html COMMENT= Multi-screen window manager -.include "options.mk" - PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir +.include "options.mk" + NOT_FOR_PLATFORM= Interix-*-* # user auth and username size fixes needed PLIST_SUBST+= DISTNAME=${DISTNAME:Q} diff --git a/misc/screen/distinfo b/misc/screen/distinfo index b6bc424c8c9..094e6b49184 100644 --- a/misc/screen/distinfo +++ b/misc/screen/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2008/04/04 21:09:16 tonnerre Exp $ +$NetBSD: distinfo,v 1.30 2009/03/05 09:59:12 jmmv Exp $ SHA1 (screen-4.0.3.tar.gz) = 7bc6e2f0959ffaae6f52d698c26c774e7dec3545 RMD160 (screen-4.0.3.tar.gz) = 8c3903c1642ae30fd9d5706298919428552f7754 @@ -12,7 +12,7 @@ SHA1 (patch-aj) = 7cb56d912aa40a4840a9a690394dcf50b0dd319d SHA1 (patch-ak) = 5b2fe45dc82f9ed36256b06f27bffafe3071769d SHA1 (patch-al) = 6ee93058847f3894a886346676e4a613c0bd134e SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9 -SHA1 (patch-an) = 79d84b0caaad6044cf81c0fcfc1cd8470c9378d8 +SHA1 (patch-an) = 44712ae5875c60eac0d4d6ba5cc3731dbfd4458b SHA1 (patch-ao) = 81b0d64dd5918cd4d6fbc02dff0470a441a200d4 SHA1 (patch-ap) = fd3717b70f3ade08de486e4ffad9cac39c11d3bf SHA1 (patch-aq) = 997a0ce76086f1dd966868b1fc9ca3bb96b4b4fb diff --git a/misc/screen/patches/patch-an b/misc/screen/patches/patch-an index 46f103e4b54..455d6f26c70 100644 --- a/misc/screen/patches/patch-an +++ b/misc/screen/patches/patch-an @@ -1,7 +1,7 @@ -$NetBSD: patch-an,v 1.2 2003/12/11 22:35:09 grant Exp $ +$NetBSD: patch-an,v 1.3 2009/03/05 09:59:12 jmmv Exp $ ---- Makefile.in.orig 2003-09-19 02:13:02.000000000 +1000 -+++ Makefile.in +--- Makefile.in.orig 2006-10-23 15:06:32.000000000 +0200 ++++ Makefile.in 2009-03-05 11:40:26.000000000 +0100 @@ -55,12 +55,12 @@ CFILES= screen.c ansi.c fileio.c mark.c search.c tty.c term.c window.c utmp.c loadav.c putenv.c help.c \ termcap.c input.c attacher.c pty.c process.c display.c comm.c \ @@ -17,9 +17,13 @@ $NetBSD: patch-an,v 1.2 2003/12/11 22:35:09 grant Exp $ all: screen -@@ -78,7 +78,7 @@ install_bin: .version screen - # This doesn't work if $(bindir)/screen is a symlink - -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi +@@ -74,11 +74,8 @@ install_bin: .version screen + -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ + then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi + $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) +- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) +-# This doesn't work if $(bindir)/screen is a symlink +- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi rm -f $(DESTDIR)$(bindir)/screen - (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen) + (cd $(DESTDIR)$(bindir) && ln -s -f $(SCREEN) screen) |