Update to new snapshot osh-20150115; use MAKE_FLAGS instead of patch.
This commit is contained in:
parent
4e4a488411
commit
c2633ff754
@ -1,8 +1,11 @@
|
|||||||
# $OpenBSD: Makefile,v 1.4 2014/04/27 06:35:08 benoit Exp $
|
# $OpenBSD: Makefile,v 1.5 2015/04/08 18:21:48 pascal Exp $
|
||||||
|
|
||||||
COMMENT = Sixth Edition UNIX Shell
|
COMMENT = Sixth Edition UNIX Shell
|
||||||
|
|
||||||
DISTNAME = osh-20140410
|
V = 20150115
|
||||||
|
DISTNAME = osh-$V
|
||||||
|
|
||||||
|
SUBST_VARS += V
|
||||||
|
|
||||||
CATEGORIES = shells
|
CATEGORIES = shells
|
||||||
|
|
||||||
@ -17,7 +20,10 @@ WANTLIB = c
|
|||||||
|
|
||||||
MASTER_SITES = ${HOMEPAGE}/src/
|
MASTER_SITES = ${HOMEPAGE}/src/
|
||||||
|
|
||||||
MAKE_FLAGS = SYSCONFDIR="${SYSCONFDIR}" PREFIX="${TRUEPREFIX}"
|
MAKE_FLAGS = SYSCONFDIR="${SYSCONFDIR}" PREFIX="${TRUEPREFIX}" \
|
||||||
|
BINGRP="-g ${BINGRP}" MANGRP="-g ${MANGRP}" \
|
||||||
|
BINMODE="-m ${BINMODE}" MANMODE="-m ${MANMODE}" \
|
||||||
|
MANDIR="${PREFIX}/man/man1"
|
||||||
|
|
||||||
NO_TEST = Yes
|
NO_TEST = Yes
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
SHA256 (osh-20140410.tar.gz) = wYMOz1bUcFp0RnelP3my7G5x6Pn7miKdw2Mq/Y56T/Y=
|
SHA256 (osh-20150115.tar.gz) = cRFR8iKn8+fLlQDRHe17sZpm+UZB81LgzLMW3ZZlqh0=
|
||||||
SIZE (osh-20140410.tar.gz) = 127676
|
SIZE (osh-20150115.tar.gz) = 129354
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
$OpenBSD: patch-Makefile,v 1.2 2014/04/27 06:35:08 benoit Exp $
|
|
||||||
--- Makefile.orig Thu Apr 10 06:48:06 2014
|
|
||||||
+++ Makefile Sat Apr 26 22:29:28 2014
|
|
||||||
@@ -15,12 +15,12 @@ PREFIX?= /usr/local
|
|
||||||
BINDIR?= $(PREFIX)/bin
|
|
||||||
DOCDIR?= $(PREFIX)/share/doc/$(OSH_VERSION)
|
|
||||||
EXPDIR?= $(DOCDIR)/examples
|
|
||||||
-MANDIR?= $(PREFIX)/share/man/man1
|
|
||||||
+MANDIR?= $(PREFIX)/man/man1
|
|
||||||
SYSCONFDIR?= $(PREFIX)/etc
|
|
||||||
#BINGRP= -g bin
|
|
||||||
-BINMODE= -m 0555
|
|
||||||
+#BINMODE= -m 0555
|
|
||||||
#MANGRP= -g bin
|
|
||||||
-MANMODE= -m 0444
|
|
||||||
+#MANMODE= -m 0444
|
|
||||||
|
|
||||||
#
|
|
||||||
# Build utilities (SHELL must be POSIX-compliant)
|
|
||||||
@@ -45,7 +45,7 @@ WARNINGS= -Wall -W
|
|
||||||
#WARNINGS+= -Wstack-protector
|
|
||||||
#WARNINGS+= -Wshorten-64-to-32
|
|
||||||
#CFLAGS+= -g
|
|
||||||
-CFLAGS+= -Os $(OPTIONS) $(WARNINGS)
|
|
||||||
+CFLAGS+= $(OPTIONS) $(WARNINGS)
|
|
||||||
#LDFLAGS+= -static
|
|
||||||
|
|
||||||
#
|
|
||||||
@@ -181,24 +181,24 @@ install-sh6all: sh6all install-sh6 install-utils
|
|
||||||
install-utils: install-ubin install-uman
|
|
||||||
|
|
||||||
install-osh: $(OSH) $(OSHMAN) install-dest
|
|
||||||
- $(INSTALL) -c -s $(BINGRP) $(BINMODE) osh $(DESTBINDIR)
|
|
||||||
- $(INSTALL) -c $(MANGRP) $(MANMODE) osh.1.out $(DESTMANDIR)/osh.1
|
|
||||||
+ $(INSTALL) -c -s -g $(BINGRP) -m $(BINMODE) osh $(DESTBINDIR)
|
|
||||||
+ $(INSTALL) -c -g $(MANGRP) -m $(MANMODE) osh.1.out $(DESTMANDIR)/osh.1
|
|
||||||
|
|
||||||
install-sh6: $(SH6) $(SH6MAN) install-dest
|
|
||||||
- $(INSTALL) -c -s $(BINGRP) $(BINMODE) sh6 $(DESTBINDIR)
|
|
||||||
- $(INSTALL) -c $(MANGRP) $(MANMODE) sh6.1.out $(DESTMANDIR)/sh6.1
|
|
||||||
- $(INSTALL) -c -s $(BINGRP) $(BINMODE) glob6 $(DESTBINDIR)
|
|
||||||
- $(INSTALL) -c $(MANGRP) $(MANMODE) glob6.1.out $(DESTMANDIR)/glob6.1
|
|
||||||
+ $(INSTALL) -c -s -g $(BINGRP) -m $(BINMODE) sh6 $(DESTBINDIR)
|
|
||||||
+ $(INSTALL) -c -g $(MANGRP) -m $(MANMODE) sh6.1.out $(DESTMANDIR)/sh6.1
|
|
||||||
+ $(INSTALL) -c -s -g $(BINGRP) -m $(BINMODE) glob6 $(DESTBINDIR)
|
|
||||||
+ $(INSTALL) -c -g $(MANGRP) -m $(MANMODE) glob6.1.out $(DESTMANDIR)/glob6.1
|
|
||||||
|
|
||||||
install-ubin: $(UBIN) install-dest
|
|
||||||
- $(INSTALL) -c -s $(BINGRP) $(BINMODE) fd2 $(DESTBINDIR)
|
|
||||||
- $(INSTALL) -c -s $(BINGRP) $(BINMODE) goto $(DESTBINDIR)
|
|
||||||
- $(INSTALL) -c -s $(BINGRP) $(BINMODE) if $(DESTBINDIR)
|
|
||||||
+ $(INSTALL) -c -s -g $(BINGRP) -m $(BINMODE) fd2 $(DESTBINDIR)
|
|
||||||
+ $(INSTALL) -c -s -g $(BINGRP) -m $(BINMODE) goto $(DESTBINDIR)
|
|
||||||
+ $(INSTALL) -c -s -g $(BINGRP) -m $(BINMODE) if $(DESTBINDIR)
|
|
||||||
|
|
||||||
install-uman: $(UMAN) install-dest
|
|
||||||
- $(INSTALL) -c $(MANGRP) $(MANMODE) fd2.1.out $(DESTMANDIR)/fd2.1
|
|
||||||
- $(INSTALL) -c $(MANGRP) $(MANMODE) goto.1.out $(DESTMANDIR)/goto.1
|
|
||||||
- $(INSTALL) -c $(MANGRP) $(MANMODE) if.1.out $(DESTMANDIR)/if.1
|
|
||||||
+ $(INSTALL) -c -g $(MANGRP) -m $(MANMODE) fd2.1.out $(DESTMANDIR)/fd2.1
|
|
||||||
+ $(INSTALL) -c -g $(MANGRP) -m $(MANMODE) goto.1.out $(DESTMANDIR)/goto.1
|
|
||||||
+ $(INSTALL) -c -g $(MANGRP) -m $(MANMODE) if.1.out $(DESTMANDIR)/if.1
|
|
||||||
|
|
||||||
install-dest:
|
|
||||||
test -d $(DESTBINDIR) || { umask 0022 && mkdir -p $(DESTBINDIR) ; }
|
|
||||||
@@ -206,11 +206,11 @@ install-dest:
|
|
||||||
|
|
||||||
install-doc:
|
|
||||||
test -d $(DESTDOCDIR) || { umask 0022 && mkdir -p $(DESTDOCDIR) ; }
|
|
||||||
- $(INSTALL) -c $(MANGRP) $(MANMODE) [ACDILNPR]* $(DESTDOCDIR)
|
|
||||||
+ $(INSTALL) -c -g $(MANGRP) -m $(MANMODE) [ACDILNPR]* $(DESTDOCDIR)
|
|
||||||
|
|
||||||
install-exp:
|
|
||||||
test -d $(DESTEXPDIR) || { umask 0022 && mkdir -p $(DESTEXPDIR) ; }
|
|
||||||
- $(INSTALL) -c $(MANGRP) $(MANMODE) examples/* $(DESTEXPDIR)
|
|
||||||
+ $(INSTALL) -c -g $(MANGRP) -m $(MANMODE) examples/* $(DESTEXPDIR)
|
|
||||||
|
|
||||||
#
|
|
||||||
# Cleanup targets
|
|
@ -1,13 +1,15 @@
|
|||||||
@comment $OpenBSD: PLIST,v 1.2 2012/06/26 22:08:01 pascal Exp $
|
@comment $OpenBSD: PLIST,v 1.3 2015/04/08 18:21:48 pascal Exp $
|
||||||
@conflict omake-*
|
@conflict omake-*
|
||||||
@bin bin/fd2
|
|
||||||
@bin bin/glob6
|
|
||||||
@bin bin/goto
|
|
||||||
@bin bin/if
|
|
||||||
@shell bin/osh
|
@shell bin/osh
|
||||||
@shell bin/sh6
|
@shell bin/sh6
|
||||||
|
libexec/osh-${V}/
|
||||||
|
libexec/osh-${V}/README
|
||||||
|
@bin libexec/osh-${V}/fd2
|
||||||
|
@bin libexec/osh-${V}/glob
|
||||||
|
@bin libexec/osh-${V}/goto
|
||||||
|
@bin libexec/osh-${V}/if
|
||||||
@man man/man1/fd2.1
|
@man man/man1/fd2.1
|
||||||
@man man/man1/glob6.1
|
@man man/man1/glob.1
|
||||||
@man man/man1/goto.1
|
@man man/man1/goto.1
|
||||||
@man man/man1/if.1
|
@man man/man1/if.1
|
||||||
@man man/man1/osh.1
|
@man man/man1/osh.1
|
||||||
|
Loading…
Reference in New Issue
Block a user