diff --git a/shells/sash/Makefile b/shells/sash/Makefile index 6dd1dd94d35a..e0fce1e4b728 100644 --- a/shells/sash/Makefile +++ b/shells/sash/Makefile @@ -1,10 +1,11 @@ PORTNAME= sash PORTVERSION= 3.8 +PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= http://members.tip.net.au/~dbell/programs/ MAINTAINER= ports@FreeBSD.org COMMENT= Stand-Alone shell combining many common utilities WWW= https://members.tip.net.au/~dbell/ .include diff --git a/shells/sash/files/patch-Makefile b/shells/sash/files/patch-Makefile index d87e5f4675d5..a97af0e1c2a0 100644 --- a/shells/sash/files/patch-Makefile +++ b/shells/sash/files/patch-Makefile @@ -1,61 +1,60 @@ ---- Makefile.orig 2014-03-05 18:56:53.000000000 +0900 -+++ Makefile 2014-03-13 03:27:58.000000000 +0900 -@@ -19,17 +19,17 @@ +--- Makefile.orig 2014-03-05 09:56:53 UTC ++++ Makefile +@@ -19,17 +19,17 @@ HAVE_GZIP = 1 # HAVE_GZIP = 1 -HAVE_LINUX_ATTR = 1 -HAVE_LINUX_CHROOT = 1 -HAVE_LINUX_LOSETUP = 1 -HAVE_LINUX_PIVOT = 1 -HAVE_LINUX_MOUNT = 1 -HAVE_BSD_MOUNT = 0 -MOUNT_TYPE = '"ext3"' +HAVE_LINUX_ATTR = 0 +HAVE_LINUX_CHROOT = 0 +HAVE_LINUX_LOSETUP = 0 +HAVE_LINUX_PIVOT = 0 +HAVE_LINUX_MOUNT = 0 +HAVE_BSD_MOUNT = 1 +MOUNT_TYPE = '"ufs"' OPT = -O3 -CFLAGS = $(OPT) -Wall -Wmissing-prototypes \ +CFLAGS += -Wall -Wmissing-prototypes \ -DHAVE_GZIP=$(HAVE_GZIP) \ -DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \ -DHAVE_LINUX_CHROOT=$(HAVE_LINUX_CHROOT) \ -@@ -43,24 +43,26 @@ +@@ -43,24 +43,25 @@ LIBS = -lz LIBS = -lz -DESTDIR = -BINDIR = /bin -MANDIR = /usr/man +#DESTDIR = +PREFIX ?= /usr/local -+MANPREFIX ?= $(PREFIX) +BINDIR = $(PREFIX)/bin -+MANDIR = $(MANPREFIX)/man ++MANDIR = $(PREFIX)/share/man OBJS = sash.o cmds.o cmd_dd.o cmd_ed.o cmd_grep.o cmd_ls.o cmd_tar.o \ cmd_gzip.o cmd_find.o cmd_file.o cmd_chattr.o cmd_ar.o utils.o +all: sash sash: $(OBJS) $(CC) $(LDFLAGS) -o sash $(OBJS) $(LIBS) - strip sash clean: rm -f $(OBJS) sash install: sash - cp sash $(DESTDIR)/$(BINDIR)/sash - cp sash.1 $(DESTDIR)/$(MANDIR)/man1/sash.1 + ${BSD_INSTALL_PROGRAM} sash $(DESTDIR)$(BINDIR)/sash + ${BSD_INSTALL_MAN} sash.1 $(DESTDIR)$(MANDIR)/man1/sash.1 $(OBJS): sash.h diff --git a/shells/sash/pkg-plist b/shells/sash/pkg-plist index 71242f07d40d..2d4dc1e64572 100644 --- a/shells/sash/pkg-plist +++ b/shells/sash/pkg-plist @@ -1,2 +1,2 @@ @shell bin/sash -man/man1/sash.1.gz +share/man/man1/sash.1.gz