diff options
| author | kim <kim@pkgsrc.org> | 2014-08-09 10:38:18 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2014-08-09 10:38:18 +0000 |
| commit | 143728e4431962ba4e10c049bd563f9a2612b2d4 (patch) | |
| tree | 24d69f971a9219d4141a401f23e46b3ae78e0f34 /sysutils/rtty | |
| parent | 13d5be5361ef29df650b10c1424fc53d0f6ed9ba (diff) | |
| download | pkgsrc-143728e4431962ba4e10c049bd563f9a2612b2d4.tar.gz | |
Make "make package" as an unprivileged user work by avoiding mode 111
on binaries. While there, make the modes more conventional (755) overall.
Diffstat (limited to 'sysutils/rtty')
| -rw-r--r-- | sysutils/rtty/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/rtty/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/rtty/patches/patch-aa | 27 |
3 files changed, 28 insertions, 11 deletions
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile index 581ad72ddfc..89605a9d6d5 100644 --- a/sysutils/rtty/Makefile +++ b/sysutils/rtty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2014/02/15 23:54:46 wiedi Exp $ +# $NetBSD: Makefile,v 1.31 2014/08/09 10:38:18 kim Exp $ DISTNAME= rtty-3.2 PKGREVISION= 1 @@ -19,7 +19,11 @@ CFLAGS.SunOS+= -Du_int16_t=uint16_t -Du_int32_t=uint32_t MAKE_ENV+= LIBS="-lcrypt" .endif -pre-configure: +# Use pre-patch so that all patches can be made against what is there +# in the work directory after failed compiles. Also feels more logical +# to have "make patch" complete *all* patching. + +pre-patch: ${CHMOD} u+w ${WRKDIR}/* for f in `echo ${WRKDIR}/* | ${XARGS} ${GREP} -l '/usr/local'`; do \ ${ECHO} patching $$f ; \ diff --git a/sysutils/rtty/distinfo b/sysutils/rtty/distinfo index 8e7a142d88f..d70e61ad4cc 100644 --- a/sysutils/rtty/distinfo +++ b/sysutils/rtty/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2006/12/17 20:09:26 minskim Exp $ +$NetBSD: distinfo,v 1.5 2014/08/09 10:38:18 kim Exp $ SHA1 (rtty-3.2.tar.gz) = 62587ee4eec0b551b2b38341f20fddebde1ee8a1 RMD160 (rtty-3.2.tar.gz) = 03863b5fbaf27a6f254c620e91c3dcd364df926a Size (rtty-3.2.tar.gz) = 23445 bytes -SHA1 (patch-aa) = 347e1522c9f4a13f821799c17a8950421ec9170a +SHA1 (patch-aa) = 666df59625dbe76ffb01bb12d7433860060ec032 SHA1 (patch-ab) = 32644f9383ef43b45421fc100382509e2e6b2e34 SHA1 (patch-ac) = 8b1b1be9eb471f68d62b4454f9bd74dddb471d75 SHA1 (patch-ad) = dee546ca499fa4fb534f137d58fcbbb800b244d3 diff --git a/sysutils/rtty/patches/patch-aa b/sysutils/rtty/patches/patch-aa index 22d61729f89..e1117e1a84b 100644 --- a/sysutils/rtty/patches/patch-aa +++ b/sysutils/rtty/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.4 2006/12/17 20:09:26 minskim Exp $ +$NetBSD: patch-aa,v 1.5 2014/08/09 10:38:18 kim Exp $ ---- Makefile.orig 1996-08-23 23:46:42.000000000 +0000 -+++ Makefile -@@ -23,7 +23,7 @@ DESTROOT = - DESTPATH = $(DESTROOT)/usr/local/rtty +--- Makefile.orig 2014-08-09 08:48:45.000000000 +0000 ++++ Makefile 2014-08-09 08:52:19.000000000 +0000 +@@ -23,7 +23,7 @@ + DESTPATH = $(DESTROOT)/usr/pkg/rtty DESTBIN = $(DESTPATH)/bin -CC = cc @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2006/12/17 20:09:26 minskim Exp $ CDEBUG = -O -g # # use -U to undefine, -D to define -@@ -35,16 +35,25 @@ CDEBUG = -O -g +@@ -35,16 +35,25 @@ # NO_SOCKADDR_LEN if your "struct sockaddr_in" lacks a sin_len field # NO_HSTRERROR if your C library has no hstrerror() function # @@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.4 2006/12/17 20:09:26 minskim Exp $ +CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_STRDUP \ -UNO_SOCKADDR_LEN -UNO_HSTRERROR # --CFLAGS = $(CDEBUG) $(CDEFS) -I/usr/local/include +-CFLAGS = $(CDEBUG) $(CDEFS) -I/usr/pkg/include -LIBS = +CFLAGS+= $(CDEBUG) $(CDEFS) +#LIBS = @@ -40,3 +40,16 @@ $NetBSD: patch-aa,v 1.4 2006/12/17 20:09:26 minskim Exp $ BINARY = ttysrv rtty locbrok SCRIPT = Startup console startsrv agelogs agelog ALL = $(BINARY) $(SCRIPT) +@@ -63,10 +72,10 @@ + test -d $(DESTPATH)/$$x || mkdir $(DESTPATH)/$$x; \ + done + set -x; for x in $(BINARY); do \ +- install -c -m 111 $$x $(DESTBIN)/$$x; \ ++ install -c -m 755 $$x $(DESTBIN)/$$x; \ + done + set -x; for x in $(SCRIPT); do \ +- install -c -m 555 $$x $(DESTBIN)/$$x; \ ++ install -c -m 755 $$x $(DESTBIN)/$$x; \ + done + + ttysrv: ttysrv.o ttyprot.o connutil.o misc.o version.o |