[Midnightbsd-cvs] mports [18525] trunk/shells/sash: fix patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Apr 1 06:47:24 EDT 2015
Revision: 18525
http://svnweb.midnightbsd.org/mports/?rev=18525
Author: laffer1
Date: 2015-04-01 06:47:23 -0400 (Wed, 01 Apr 2015)
Log Message:
-----------
fix patchset
Modified Paths:
--------------
trunk/shells/sash/Makefile
trunk/shells/sash/files/patch-Makefile
trunk/shells/sash/files/patch-cmds.c
Added Paths:
-----------
trunk/shells/sash/files/patch-sash.c
Modified: trunk/shells/sash/Makefile
===================================================================
--- trunk/shells/sash/Makefile 2015-04-01 10:45:48 UTC (rev 18524)
+++ trunk/shells/sash/Makefile 2015-04-01 10:47:23 UTC (rev 18525)
@@ -2,6 +2,7 @@
PORTNAME= sash
PORTVERSION= 3.8
+PORTREVISION= 1
CATEGORIES= shells
MASTER_SITES= http://members.tip.net.au/~dbell/programs/
Modified: trunk/shells/sash/files/patch-Makefile
===================================================================
--- trunk/shells/sash/files/patch-Makefile 2015-04-01 10:45:48 UTC (rev 18524)
+++ trunk/shells/sash/files/patch-Makefile 2015-04-01 10:47:23 UTC (rev 18525)
@@ -1,38 +1,61 @@
---- Makefile.orig Mon Jul 22 01:24:47 2002
-+++ Makefile Fri Sep 3 14:53:40 2004
-@@ -8,13 +8,13 @@
- # The MOUNT_TYPE definition sets the default file system type for -mount.
+--- Makefile.orig 2014-03-05 18:56:53.000000000 +0900
++++ Makefile 2014-03-13 03:27:58.000000000 +0900
+@@ -19,17 +19,17 @@
#
+
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 = -O3 -Wall -Wmissing-prototypes \
+-CFLAGS = $(OPT) -Wall -Wmissing-prototypes \
+CFLAGS += -Wall -Wmissing-prototypes \
-DHAVE_GZIP=$(HAVE_GZIP) \
-DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \
- -DHAVE_LINUX_MOUNT=$(HAVE_LINUX_MOUNT) \
-@@ -25,13 +25,14 @@
+ -DHAVE_LINUX_CHROOT=$(HAVE_LINUX_CHROOT) \
+@@ -43,24 +43,26 @@
LIBS = -lz
+-DESTDIR =
-BINDIR = /bin
--MANDIR = /usr/man/man1
+-MANDIR = /usr/man
++#DESTDIR =
++PREFIX ?= /usr/local
++MANPREFIX ?= $(PREFIX)
+BINDIR = $(PREFIX)/bin
-+MANDIR = $(MANPREFIX)/man/man1
++MANDIR = $(MANPREFIX)/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
++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
Modified: trunk/shells/sash/files/patch-cmds.c
===================================================================
--- trunk/shells/sash/files/patch-cmds.c 2015-04-01 10:45:48 UTC (rev 18524)
+++ trunk/shells/sash/files/patch-cmds.c 2015-04-01 10:47:23 UTC (rev 18525)
@@ -1,6 +1,6 @@
--- cmds.c.orig Mon Jul 22 00:28:19 2002
+++ cmds.c Fri Sep 3 16:35:01 2004
-@@ -17,6 +17,18 @@
+@@ -17,9 +17,18 @@
#include <utime.h>
#include <errno.h>
@@ -7,19 +7,28 @@
+#if __FreeBSD__
+#include <ufs/ufs/ufsmount.h>
+#include <isofs/cd9660/cd9660_mount.h>
-+#if __FreeBSD_version >= 500019
+#include <fs/msdosfs/msdosfsmount.h>
++#if __FreeBSD_version < 1000000
+#include <fs/ntfs/ntfsmount.h>
-+#else
-+#include <msdosfs/msdosfsmount.h>
-+#include <ntfs/ntfsmount.h>
++#define HAVE_BSD_NTFSMOUNT
+#endif
+#endif
+
#if HAVE_LINUX_MOUNT
#include <linux/fs.h>
- #endif
-@@ -564,6 +576,10 @@
+-#endif
+
+ /* Need to tell loop.h what the actual dev_t type is. */
+ #undef dev_t
+@@ -32,6 +41,7 @@
+ #undef dev_t
+ #define dev_t dev_t
+
++#endif
+
+ int
+ do_echo(int argc, const char ** argv)
+@@ -716,6 +726,10 @@
flags |= MNT_RDONLY;
break;
@@ -30,7 +39,7 @@
case 's':
flags |= MNT_NOSUID;
break;
-@@ -594,35 +610,47 @@
+@@ -748,46 +762,58 @@
#elif HAVE_BSD_MOUNT
{
struct ufs_args ufs;
@@ -38,30 +47,37 @@
struct iso_args iso;
- struct mfs_args mfs;
struct msdosfs_args msdosfs;
++#ifdef HAVE_BSD_NTFSMOUNT
+ struct ntfs_args ntfs;
++#endif
void * args;
- if(!strcmp(type, "ffs") || !strcmp(type, "ufs")) {
+ if (!strcmp(type, "ffs") || !strcmp(type, "ufs"))
+ {
+ memset(&ufs, 0, sizeof(ufs));
ufs.fspec = (char*) argv[0];
args = &ufs;
-- } else if(!strcmp(type, "adosfs")) {
+ }
+- else if (!strcmp(type, "adosfs"))
+- {
- adosfs.fspec = (char*) argv[0];
- adosfs.uid = 0;
- adosfs.gid = 0;
- args = &adosfs;
- } else if(!strcmp(type, "cd9660")) {
+- }
+ else if (!strcmp(type, "cd9660"))
+ {
+ memset(&iso, 0, sizeof(iso));
iso.fspec = (char*) argv[0];
args = &iso;
-- } else if(!strcmp(type, "mfs")) {
+ }
+- else if (!strcmp(type, "mfs"))
+- {
- mfs.fspec = (char*) argv[0];
- args = &mfs;
-+ } else if(!strcmp(type, "ext2fs")) {
-+ memset(&ufs, 0, sizeof(ufs));
-+ ufs.fspec = (char*) argv[0];
-+ args = &ufs;
- } else if(!strcmp(type, "msdos")) {
+- }
+ else if (!strcmp(type, "msdos"))
+ {
+ memset(&msdosfs, 0, sizeof(msdosfs));
msdosfs.fspec = (char*) argv[0];
- msdosfs.uid = 0;
@@ -73,6 +89,7 @@
+ msdosfs.mask = msdosfs.dirmask = 7555;
+ }
args = &msdosfs;
++#ifdef HAVE_BSD_NTFSMOUNT
+ } else if(!strcmp(type, "ntfs")) {
+ memset(&ntfs, 0, sizeof(ntfs));
+ ntfs.fspec = (char*) argv[0];
@@ -83,11 +100,18 @@
+ ntfs.mode = 0755;
+ }
+ args = &ntfs;
- } else {
++#endif
+ }
+ else
+ {
fprintf(stderr, "Unknown filesystem type: %s", type);
fprintf(stderr,
- "Supported: ffs ufs adosfs cd9660 mfs msdos\n");
++#ifdef HAVE_BSD_NTFSMOUNT
+ "Supported: ffs ufs cd9660 ext2fs msdos ntfs\n");
- return;
++#else
++ "Supported: ffs ufs cd9660 ext2fs msdos\n");
++#endif
+
+ return 1;
}
-
Added: trunk/shells/sash/files/patch-sash.c
===================================================================
--- trunk/shells/sash/files/patch-sash.c (rev 0)
+++ trunk/shells/sash/files/patch-sash.c 2015-04-01 10:47:23 UTC (rev 18525)
@@ -0,0 +1,29 @@
+--- sash.c.orig
++++ sash.c
+@@ -107,7 +107,7 @@
+ "srcName ... destName"
+ },
+
+-#ifdef HAVE_LINUX_CHROOT
++#if HAVE_LINUX_CHROOT
+ {
+ "-chroot", do_chroot, 2, 2,
+ "change root file system",
+@@ -189,7 +189,7 @@
+ "[-sig] pid ..."
+ },
+
+-#ifdef HAVE_LINUX_LOSETUP
++#if HAVE_LINUX_LOSETUP
+ {
+ "-losetup", do_losetup, 3, 3,
+ "Associate a loopback device with a file",
+@@ -253,7 +253,7 @@
+ "srcName ... destName"
+ },
+
+-#ifdef HAVE_LINUX_PIVOT
++#if HAVE_LINUX_PIVOT
+ {
+ "-pivot_root", do_pivot_root, 3, 3,
+ "pivot the root file system",
Property changes on: trunk/shells/sash/files/patch-sash.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list