From 47b8b067df49ccfd6392731bb44a7898b1e2d296 Mon Sep 17 00:00:00 2001 From: christos Date: Wed, 11 Apr 2007 04:56:56 +0000 Subject: fix the names, silly me. --- shells/tcsh/patches/patch-aa | 24 ++++++++++++++++++++++++ shells/tcsh/patches/patch-ab | 24 ++++++++++++++++++++++++ shells/tcsh/patches/patches-aa | 24 ------------------------ shells/tcsh/patches/patches-ab | 24 ------------------------ 4 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 shells/tcsh/patches/patch-aa create mode 100644 shells/tcsh/patches/patch-ab delete mode 100644 shells/tcsh/patches/patches-aa delete mode 100644 shells/tcsh/patches/patches-ab (limited to 'shells/tcsh') diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa new file mode 100644 index 00000000000..486b29e0979 --- /dev/null +++ b/shells/tcsh/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.10 2007/04/11 04:56:56 christos Exp $ + +--- Makefile.in.orig 2007-04-09 20:02:33.000000000 -0400 ++++ Makefile.in 2007-04-09 20:04:47.000000000 -0400 +@@ -512,17 +512,10 @@ + install-strip: install + + install: tcsh$(EXEEXT) +- -mkdir -p ${DESTBIN} +- -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old +- cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) +- -strip ${DESTBIN}/tcsh$(EXEEXT) +- chmod 755 ${DESTBIN}/tcsh$(EXEEXT) ++ ${BSD_INSTALL_PROGRAM} tcsh${EXEEXT} ${DESTBIN}/tcsh${EXEEXT} + + install.man: tcsh.man +- -mkdir -p ${DESTMAN} +- -rm -f ${DESTMAN}/tcsh.${MANSECT} +- cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT} +- chmod 444 ${DESTMAN}/tcsh.${MANSECT} ++ ${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT} + + install.cygwin: install install.man + -mkdir -p ${DESTDIR}${prefix}/share/doc/tcsh diff --git a/shells/tcsh/patches/patch-ab b/shells/tcsh/patches/patch-ab new file mode 100644 index 00000000000..063a5119aba --- /dev/null +++ b/shells/tcsh/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.11 2007/04/11 04:56:56 christos Exp $ + +--- config_f.h.orig 2006-08-28 10:53:04.000000000 -0400 ++++ config_f.h 2007-04-09 20:02:34.000000000 -0400 +@@ -44,7 +44,18 @@ + * of nls... + * + */ +-#define SHORT_STRINGS ++#if defined(__NetBSD__) ++# include ++# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 200000000) ++# define SHORT_STRINGS ++# else ++# undef SHORT_STRINGS ++# endif ++#elif defined(__OpenBSD__) ++# undef SHORT_STRINGS ++#else ++# define SHORT_STRINGS ++#endif + + /* + * WIDE_STRINGS Represent strings using wide characters diff --git a/shells/tcsh/patches/patches-aa b/shells/tcsh/patches/patches-aa deleted file mode 100644 index 3561fdc1ab2..00000000000 --- a/shells/tcsh/patches/patches-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patches-aa,v 1.1 2007/04/10 00:50:24 christos Exp $ - ---- Makefile.in.orig 2007-04-09 20:02:33.000000000 -0400 -+++ Makefile.in 2007-04-09 20:04:47.000000000 -0400 -@@ -512,17 +512,10 @@ - install-strip: install - - install: tcsh$(EXEEXT) -- -mkdir -p ${DESTBIN} -- -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old -- cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) -- -strip ${DESTBIN}/tcsh$(EXEEXT) -- chmod 755 ${DESTBIN}/tcsh$(EXEEXT) -+ ${BSD_INSTALL_PROGRAM} tcsh${EXEEXT} ${DESTBIN}/tcsh${EXEEXT} - - install.man: tcsh.man -- -mkdir -p ${DESTMAN} -- -rm -f ${DESTMAN}/tcsh.${MANSECT} -- cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT} -- chmod 444 ${DESTMAN}/tcsh.${MANSECT} -+ ${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT} - - install.cygwin: install install.man - -mkdir -p ${DESTDIR}${prefix}/share/doc/tcsh diff --git a/shells/tcsh/patches/patches-ab b/shells/tcsh/patches/patches-ab deleted file mode 100644 index 4fd3f31b59b..00000000000 --- a/shells/tcsh/patches/patches-ab +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patches-ab,v 1.1 2007/04/10 00:50:24 christos Exp $ - ---- config_f.h.orig 2006-08-28 10:53:04.000000000 -0400 -+++ config_f.h 2007-04-09 20:02:34.000000000 -0400 -@@ -44,7 +44,18 @@ - * of nls... - * - */ --#define SHORT_STRINGS -+#if defined(__NetBSD__) -+# include -+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 200000000) -+# define SHORT_STRINGS -+# else -+# undef SHORT_STRINGS -+# endif -+#elif defined(__OpenBSD__) -+# undef SHORT_STRINGS -+#else -+# define SHORT_STRINGS -+#endif - - /* - * WIDE_STRINGS Represent strings using wide characters -- cgit v1.2.3