pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc move the various static shell packages back to their p...
details: https://anonhg.NetBSD.org/pkgsrc/rev/88b99975f533
branches: trunk
changeset: 466122:88b99975f533
user: grant <grant%pkgsrc.org@localhost>
date: Sun Jan 11 23:06:54 2004 +0000
description:
move the various static shell packages back to their previous names.
diffstat:
misc/openoffice/Makefile | 4 ++--
shells/Makefile | 10 +++++-----
shells/ast-ksh-static/Makefile | 18 ------------------
shells/bash2-static/Makefile | 17 -----------------
shells/standalone-tcsh/DESCR | 5 +++++
shells/standalone-tcsh/Makefile | 28 ++++++++++++++++++++++++++++
shells/standalone-tcsh/PLIST | 3 +++
shells/static-ast-ksh/Makefile | 16 ++++++++++++++++
shells/static-bash2/Makefile | 16 ++++++++++++++++
shells/static-tcsh/Makefile | 16 ++++++++++++++++
shells/tcsh-standalone/DESCR | 5 -----
shells/tcsh-standalone/Makefile | 31 -------------------------------
shells/tcsh-standalone/PLIST | 3 ---
shells/tcsh-static/Makefile | 17 -----------------
14 files changed, 91 insertions(+), 98 deletions(-)
diffs (273 lines):
diff -r 23d90008ed8f -r 88b99975f533 misc/openoffice/Makefile
--- a/misc/openoffice/Makefile Sun Jan 11 21:52:46 2004 +0000
+++ b/misc/openoffice/Makefile Sun Jan 11 23:06:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/01/11 01:09:12 grant Exp $
+# $NetBSD: Makefile,v 1.41 2004/01/11 23:06:54 grant Exp $
DISTNAME= openoffice-0.0.0.641
PKGREVISION= 2
@@ -39,7 +39,7 @@
.endif
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-BUILD_DEPENDS+= {tcsh-standalone,tcsh}-[0-9]*:../../shells/tcsh
+BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh
BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
BUILD_DEPENDS+= stlport>=4.0nb1:../../devel/stlport
diff -r 23d90008ed8f -r 88b99975f533 shells/Makefile
--- a/shells/Makefile Sun Jan 11 21:52:46 2004 +0000
+++ b/shells/Makefile Sun Jan 11 23:06:54 2004 +0000
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2004/01/10 17:06:37 cjep Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/11 23:06:54 grant Exp $
#
COMMENT= Shells
SUBDIR+= ast-ksh
-SUBDIR+= ast-ksh-static
SUBDIR+= bash2
SUBDIR+= bash2-doc
-SUBDIR+= bash2-static
SUBDIR+= es
SUBDIR+= esh
SUBDIR+= mudsh
@@ -17,9 +15,11 @@
SUBDIR+= perlsh
SUBDIR+= rc
SUBDIR+= scsh
+SUBDIR+= standalone-tcsh
+SUBDIR+= static-ast-ksh
+SUBDIR+= static-bash2
+SUBDIR+= static-tcsh
SUBDIR+= tcsh
-SUBDIR+= tcsh-standalone
-SUBDIR+= tcsh-static
SUBDIR+= zsh
SUBDIR+= zsh-current
SUBDIR+= zsh3
diff -r 23d90008ed8f -r 88b99975f533 shells/ast-ksh-static/Makefile
--- a/shells/ast-ksh-static/Makefile Sun Jan 11 21:52:46 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2004/01/10 07:09:26 grant Exp $
-#
-.include "../../shells/ast-ksh/Makefile.common"
-
-CONFLICTS= ast-ksh-[0-9]* # Override.
-CONFLICTS+= static-ast-ksh-[0-9]*
-
-DISTINFO_FILE= ${.CURDIR}/../../shells/ast-ksh/distinfo
-PATCHDIR= ${.CURDIR}/../../shells/ast-ksh/patches
-PKGDIR= ${.CURDIR}/../../shells/ast-ksh
-
-PKGVERSION:= ${PKGNAME:C|^.*-||}
-PKGNAME:= ${PKGBASE}-static-${PKGVERSION}
-COMMENT:= Statically-linked version of the ${COMMENT}
-
-KSH93_MAKEFLAGS=LDFLAGS=-static
-
-.include "../../mk/bsd.pkg.mk"
diff -r 23d90008ed8f -r 88b99975f533 shells/bash2-static/Makefile
--- a/shells/bash2-static/Makefile Sun Jan 11 21:52:46 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2004/01/10 07:06:44 grant Exp $
-#
-
-DISTINFO_FILE= ${.CURDIR}/../../shells/bash2/distinfo
-PATCHDIR= ${.CURDIR}/../../shells/bash2/patches
-PKGDIR= ${.CURDIR}/../../shells/bash2
-
-CONFLICTS= bash-[0-9]*
-CONFLICTS+= static-bash-[0-9]*
-
-.include "../../shells/bash2/Makefile"
-
-WRKSRC:= ${WRKDIR}/${DISTNAME}
-PKGNAME:= ${PKGBASE}-static-${PKGVERSION}
-COMMENT:= Statically-linked version of the ${COMMENT}
-
-LDFLAGS+= -static
diff -r 23d90008ed8f -r 88b99975f533 shells/standalone-tcsh/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/standalone-tcsh/DESCR Sun Jan 11 23:06:54 2004 +0000
@@ -0,0 +1,5 @@
+TCSH is an extended C-shell with many useful features like
+filename completion, history editing, etc.
+
+This version installs a statically-linked version of tcsh into
+/bin, for use as a standalone shell.
diff -r 23d90008ed8f -r 88b99975f533 shells/standalone-tcsh/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/standalone-tcsh/Makefile Sun Jan 11 23:06:54 2004 +0000
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.12 2004/01/11 23:06:54 grant Exp $
+#
+
+NO_MTREE= YES
+
+PKGNAME= standalone-${DISTNAME}
+WRKSRC= ${WRKDIR}/${DISTNAME}
+
+PKG_SHELL= /bin/tcsh
+
+.include "../../shells/tcsh/Makefile"
+
+COMMENT:= Standalone version of the Extended C-shell
+
+PATCH:= ${PATCH}
+PKG_INFO:= ${PKG_INFO}
+PKG_CREATE:= ${PKG_CREATE}
+PREFIX= /
+NLSDIR= usr/share/nls
+CONFIGURE_ARGS= --prefix=${PREFIX} --bindir=/bin
+CONFIGURE_ARGS+= --mandir=/usr/share/man
+
+DISTINFO_FILE= ${.CURDIR}/../../shells/tcsh/distinfo
+PATCHDIR= ${.CURDIR}/../../shells/tcsh/patches
+
+.if ${OPSYS} != "SunOS"
+LDFLAGS+= -static
+.endif
diff -r 23d90008ed8f -r 88b99975f533 shells/standalone-tcsh/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/standalone-tcsh/PLIST Sun Jan 11 23:06:54 2004 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.4 2004/01/11 23:06:54 grant Exp $
+bin/tcsh
+usr/share/man/man1/tcsh.1
diff -r 23d90008ed8f -r 88b99975f533 shells/static-ast-ksh/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/static-ast-ksh/Makefile Sun Jan 11 23:06:54 2004 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.4 2004/01/11 23:06:54 grant Exp $
+#
+.include "../../shells/ast-ksh/Makefile.common"
+
+CONFLICTS= ast-ksh-[0-9]* # Override.
+
+DISTINFO_FILE= ${.CURDIR}/../../shells/ast-ksh/distinfo
+PATCHDIR= ${.CURDIR}/../../shells/ast-ksh/patches
+PKGDIR= ${.CURDIR}/../../shells/ast-ksh
+
+PKGNAME:= static-${PKGNAME}
+COMMENT:= Statically-linked version of the ${COMMENT}
+
+KSH93_MAKEFLAGS=LDFLAGS=-static
+
+.include "../../mk/bsd.pkg.mk"
diff -r 23d90008ed8f -r 88b99975f533 shells/static-bash2/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/static-bash2/Makefile Sun Jan 11 23:06:54 2004 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.4 2004/01/11 23:06:54 grant Exp $
+#
+
+DISTINFO_FILE= ${.CURDIR}/../../shells/bash2/distinfo
+PATCHDIR= ${.CURDIR}/../../shells/bash2/patches
+PKGDIR= ${.CURDIR}/../../shells/bash2
+
+CONFLICTS= bash-[0-9]*
+
+.include "../../shells/bash2/Makefile"
+
+WRKSRC:= ${WRKDIR}/${DISTNAME}
+PKGNAME:= static-${DISTNAME}
+COMMENT:= Statically-linked version of the ${COMMENT}
+
+LDFLAGS+= -static
diff -r 23d90008ed8f -r 88b99975f533 shells/static-tcsh/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/static-tcsh/Makefile Sun Jan 11 23:06:54 2004 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.5 2004/01/11 23:06:54 grant Exp $
+#
+
+DISTINFO_FILE= ${.CURDIR}/../../shells/tcsh/distinfo
+PATCHDIR= ${.CURDIR}/../../shells/tcsh/patches
+PKGDIR= ${.CURDIR}/../../shells/tcsh
+
+CONFLICTS= tcsh-[0-9]*
+
+.include "../../shells/tcsh/Makefile"
+
+WRKSRC:= ${WRKDIR}/${DISTNAME}
+PKGNAME:= static-${DISTNAME}
+COMMENT:= Statically-linked version of the ${COMMENT}
+
+LDFLAGS+= -static
diff -r 23d90008ed8f -r 88b99975f533 shells/tcsh-standalone/DESCR
--- a/shells/tcsh-standalone/DESCR Sun Jan 11 21:52:46 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-TCSH is an extended C-shell with many useful features like
-filename completion, history editing, etc.
-
-This version installs a statically-linked version of tcsh into
-/bin, for use as a standalone shell.
diff -r 23d90008ed8f -r 88b99975f533 shells/tcsh-standalone/Makefile
--- a/shells/tcsh-standalone/Makefile Sun Jan 11 21:52:46 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2004/01/10 06:56:15 grant Exp $
-#
-
-NO_MTREE= YES
-
-PKGNAME= ${DISTNAME:C|-.*||}-standalone${DISTNAME:C|[^-]*||}
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
-# this package used to be called 'standalone-tcsh'
-CONFLICTS+= standalone-tcsh-[0-9]*
-
-PKG_SHELL= /bin/tcsh
-
-.include "../../shells/tcsh/Makefile"
-
-COMMENT:= Standalone version of the Extended C-shell
-
-PATCH:= ${PATCH}
-PKG_INFO:= ${PKG_INFO}
-PKG_CREATE:= ${PKG_CREATE}
-PREFIX= /
-NLSDIR= usr/share/nls
-CONFIGURE_ARGS= --prefix=${PREFIX} --bindir=/bin
-CONFIGURE_ARGS+= --mandir=/usr/share/man
-
-DISTINFO_FILE= ${.CURDIR}/../../shells/tcsh/distinfo
-PATCHDIR= ${.CURDIR}/../../shells/tcsh/patches
-
-.if ${OPSYS} != "SunOS"
-LDFLAGS+= -static
-.endif
diff -r 23d90008ed8f -r 88b99975f533 shells/tcsh-standalone/PLIST
--- a/shells/tcsh-standalone/PLIST Sun Jan 11 21:52:46 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2004/01/10 06:56:15 grant Exp $
-bin/tcsh
-usr/share/man/man1/tcsh.1
diff -r 23d90008ed8f -r 88b99975f533 shells/tcsh-static/Makefile
--- a/shells/tcsh-static/Makefile Sun Jan 11 21:52:46 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2004/01/10 06:53:45 grant Exp $
-#
-
-DISTINFO_FILE= ${.CURDIR}/../../shells/tcsh/distinfo
-PATCHDIR= ${.CURDIR}/../../shells/tcsh/patches
-PKGDIR= ${.CURDIR}/../../shells/tcsh
-
-CONFLICTS= tcsh-[0-9]*
-CONFLICTS+= static-tcsh-[0-9]*
-
-.include "../../shells/tcsh/Makefile"
-
-WRKSRC:= ${WRKDIR}/${DISTNAME}
-PKGNAME:= ${DISTNAME:C|-.*||}-static${DISTNAME:C|[^-]*||}
-COMMENT:= Statically-linked version of the ${COMMENT}
-
-LDFLAGS+= -static
Home |
Main Index |
Thread Index |
Old Index