Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Treeve Jelbert (707c7fe39032978f73aa6d800c5c95908bdbe9d4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Treeve Jelbert (707c7fe39032978f73aa6d800c5c95908bdbe9d4)
  • Date: Fri, 28 Jul 2006 16:41:07 -0500

GIT changes to master z-rejected grimoire by Treeve Jelbert
<treeve AT scarlet.be>:

z-devel/perforce-client/DETAILS | 41
++++++++++++++++++-------------------
z-devel/perforce-client/HISTORY | 6 +++++
z-devel/perforce-client/INSTALL | 1
z-devel/perforce-server/BUILD | 26 -----------------------
z-devel/perforce-server/DETAILS | 18 ++++++++--------
z-devel/perforce-server/HISTORY | 6 +++++
z-devel/perforce-server/INSTALL | 25 +++++++++++++++++++++-
z-devel/perforce-server/PRE_REMOVE | 7 ------
8 files changed, 66 insertions(+), 64 deletions(-)

New commits:
commit 707c7fe39032978f73aa6d800c5c95908bdbe9d4
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

perforce-client-2006.1.101890

commit 4a1c658d3ae1e51e09ed40be07ea9067b8308684
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

perforce-server-2006.1.101899

diff --git a/z-devel/perforce-client/DETAILS b/z-devel/perforce-client/DETAILS
index f75c67a..5a4bf19 100755
--- a/z-devel/perforce-client/DETAILS
+++ b/z-devel/perforce-client/DETAILS
@@ -1,23 +1,22 @@
SPELL=perforce-client
- DOC_VERSION=042
- BUILD_API=2
+ DOC_VERSION=061
SOURCE=p4
SOURCE2=p4web
- SOURCE3=p4.1
+ SOURCE3=p4guide.pdf
FORCE_DOWNLOAD=on

# we use HOST instead of uname -m since spells can be used for cross
compiling
# the exact version number is given by p4 -V

case "${HOST}" in
- i386-* | i486-* | i586-* | i686-*)
+ i386-* | i486-* | i586-* | i686-* | x86_64-*)

- VERSION_MAJOR=2005.2
- VERSION_MINOR=93627
- SHORT_VERSION=05.2
+ VERSION_MAJOR=2006.1
+ VERSION_MINOR=101890
+ SHORT_VERSION=06.1
P_ARCH=linux26x86
-
SOURCE_HASH=sha512:8a3e6647262d567fa15e01f877239aa0dc447b90b161a6a936b2eb73c5d4225721c57c858f40d5e7b03417a3df71b7bc555a30cafea8842dadda91924e64441a
-
SOURCE2_HASH=sha512:006bc430e9ff656d43a65c2b0730a1c2ed71f9178ce05c77e7b587ab2e2fbd3922ae8cf7c33a9bc3e677bf746f840c781c8d7038dcdc05fae5c8b1e6434b1e7d
+
SOURCE_HASH=sha512:c29730f2ceb5a7175f402a39dce8e3318f86ea69f18ddf878c01c5c4be8c3cafa47b2b3db30a9214c427bb9719b8d58b78de194870a05683f92eb5b2044a69b0
+
SOURCE2_HASH=sha512:f126130086af7ddecef34635d542284261d2bef1738daf1c4a3b73d21ea291ddb1a77773ca77c58a6f70da0795fbbae6018a1ed75a14533e162038398030ce3e
;;

powerpc-*)
@@ -30,15 +29,15 @@ case "${HOST}" in
SOURCE2_HASH=sha1:4c3497bdc4c5d449c8ea9ae8d03bdf0d20a77999
;;

- x86_64-*)
+# x86_64-*)

- VERSION_MAJOR=2005.1
- VERSION_MINOR=83219
- SHORT_VERSION=05.1
- P_ARCH=linux26amd64
- SOURCE_HASH=sha1:11f7d9886eb1f591a272ff4e66106b941df5f310
- SOURCE2_HASH=sha1:6efc809088be3bc6e928f3c7cc0a08dcac4cdb24
- ;;
+# VERSION_MAJOR=2006.1
+# VERSION_MINOR=102189
+# SHORT_VERSION=06.1
+# P_ARCH=linux26amd64
+# SOURCE_HASH=sha512:
+# SOURCE2_HASH=sha512:
+# ;;

esac

@@ -49,13 +48,13 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_URL[1]=ftp://ftp.perforce.com/perforce/r$SHORT_VERSION/bin.$P_ARCH/$SOURCE

SOURCE2_URL[0]=http://www.perforce.com/downloads/perforce/r$SHORT_VERSION/bin.$P_ARCH/$SOURCE2

SOURCE2_URL[1]=ftp://ftp.perforce.com/perforce/r$SHORT_VERSION/bin.$P_ARCH/$SOURCE2
-
SOURCE3_URL[0]=http://www.perforce.com/perforce/doc.$DOC_VERSION/man/$SOURCE3
+
SOURCE3_URL[0]=http://www.perforce.com/perforce/doc.$DOC_VERSION/manuals/p4guide/$SOURCE3
WEB_SITE=http://www.perforce.com/
ENTERED=20020514
- UPDATED=20050405
- SOURCE3_HASH=sha1:d756689967841277e893cab9bc0dbc8e95784485
+
SOURCE3_HASH=sha512:68a4fccb8667fe5dcb246c04e4cbbdfeccc329b556c8be6a2f4a324c13870c9c42d625b6aae04c81fea0dc650dc8e6e9ed057a64282e867769750a3a55943d75
LICENSE[0]=http://www.perforce.com/perforce/price.html
- GATHER_DOCS=off
+DOCS=$SOURCE3
+# GATHER_DOCS=off
REJECT="is non-source and has licensing issues"
SHORT="Perforce command line client"
cat << EOF
diff --git a/z-devel/perforce-client/HISTORY b/z-devel/perforce-client/HISTORY
index a4e640d..2910872 100644
--- a/z-devel/perforce-client/HISTORY
+++ b/z-devel/perforce-client/HISTORY
@@ -1,3 +1,9 @@
+2006-07-28 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: Updated binaries for x86/x86_64 to 2006.1/101890
+ no longer a special case for amd64
+ updated documentation p4guide.pdf
+ * INSTALL: nolonger install man page (does not exist)
+
2006-03-20 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: Updated binaries for x86 to 2005.2/93627

diff --git a/z-devel/perforce-client/INSTALL b/z-devel/perforce-client/INSTALL
index 43ceb1b..3fd6487 100755
--- a/z-devel/perforce-client/INSTALL
+++ b/z-devel/perforce-client/INSTALL
@@ -1,5 +1,4 @@
install -m 755 p4 ${INSTALL_ROOT}/usr/bin/p4 &&
install -m 755 p4web ${INSTALL_ROOT}/usr/bin/p4web &&
-install -m 644 p4.1 ${INSTALL_ROOT}/usr/share/man/man1 &&
mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
install -m 0644 $SCRIPT_DIRECTORY/p4.sh ${INSTALL_ROOT}/etc/profile.d/
diff --git a/z-devel/perforce-server/BUILD b/z-devel/perforce-server/BUILD
index 29503bb..27ba77d 100755
--- a/z-devel/perforce-server/BUILD
+++ b/z-devel/perforce-server/BUILD
@@ -1,25 +1 @@
-groupadd perforce 2>/dev/null
-mkdir /home/perforce 2>/dev/null
-useradd -g perforce perforce 2>/dev/null
-
-P4_HOME=~perforce
-
-install -m 755 p4d /usr/bin/p4d &&
-install -m 644 p4d.1 /usr/share/man/man1 &&
-install -m 755 -d -o perforce -g perforce $P4_HOME/p4root &&
-
-# The other files should only be updated if they don't already exist
-
-if [ ! -f /etc/p4d.conf ]; then
- install -m 644 $SCRIPT_DIRECTORY/p4d.conf /etc/p4d.conf
-fi
-
-if [ ! -f /$P4_HOME/.p4config ]; then
- install -m 644 -o perforce -g perforce $SCRIPT_DIRECTORY/p4config \
- /$P4_HOME/.p4config
-fi
-
-if [ ! -f $P4_HOME/scripts/backup.sh ]; then
- install -m 755 -D -o perforce -g perforce
$SCRIPT_DIRECTORY/backup.sh \
- $P4_HOME/scripts/backup.sh
-fi
+true
diff --git a/z-devel/perforce-server/DETAILS b/z-devel/perforce-server/DETAILS
index fc41786..8a9aef8 100755
--- a/z-devel/perforce-server/DETAILS
+++ b/z-devel/perforce-server/DETAILS
@@ -1,22 +1,22 @@
SPELL=perforce-server
- VERSION_MAJOR=2004.2
- SHORT_VERSION=04.2
- DOC_VERSION=042
- VERSION_MINOR=73359
+ VERSION_MAJOR=2006.1
+ SHORT_VERSION=06.1
+ DOC_VERSION=061
+ VERSION_MINOR=101899
VERSION=$VERSION_MAJOR.$VERSION_MINOR
SOURCE=p4d
- SOURCE2=p4d.1
+ SOURCE2=p4sag.pdf
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SOURCE-$VERSION_MAJOR

SOURCE_URL[0]=http://www.perforce.com/downloads/perforce/r$SHORT_VERSION/bin.linux24x86/$SOURCE

SOURCE_URL[1]=ftp://ftp.perforce.com/perforce/r$SHORT_VERSION/bin.linux24x86/$SOURCE
- SOURCE2_URL[0]=http://www.perforce.com/perforce/doc.$DOC_VERSION/man/p4d.1
+
SOURCE2_URL[0]=http://www.perforce.com/perforce/doc.$DOC_VERSION/manuals/p4sag/$SOURCE2
WEB_SITE=http://www.perforce.com
ENTERED=20020514
- UPDATED=20050409
- MD5[0]=90320ebf81126cbd923f0a893a448e14
-
SOURCE2_HASH=sha512:f9593afe480fd2f9b9eedca4a5eb97ff72e64547e394c0b8b3b365035e0fdc745e441069eb573795f745ec095ecb5d9fb61101846ce29814be7aaa00143b046f
+
SOURCE_HASH=sha512:688082d59588db0b72b6899f8190588c4c233b72ccea9d28ff6cb2eed247a2873a740b64fc70f6c91c2d87525ce0cd863a3c07ffd8e05b1ffd89b9efb526e3f3
+
SOURCE2_HASH=sha512:3bdeaf6030a1b7d1441a75a4e69660ef54b1af23c76e50feed3071e3b715ef8e141fdf9fa537170be0565d7c0586c99490bb45664abc55be7e930d0f23fbcd70
LICENSE[0]=http://www.perforce.com/perforce/price.html
FORCE_DOWNLOAD="on"
+ DOCS=$SOURCE2
REJECT="is non-source and has licensing issues"
SHORT="Perforce server"
cat << EOF
diff --git a/z-devel/perforce-server/HISTORY b/z-devel/perforce-server/HISTORY
index 010a3de..e3a5e3f 100644
--- a/z-devel/perforce-server/HISTORY
+++ b/z-devel/perforce-server/HISTORY
@@ -1,3 +1,9 @@
+2006-07-28 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 2006.1/101899
+ updated documentation p4sag.pdf
+ * BUILD, INSTALL: these two files were inverted
+ * PRE_REMOVE: delete, we should not stop the server here
+
2005-12-01 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/z-devel/perforce-server/INSTALL b/z-devel/perforce-server/INSTALL
index 27ba77d..2499235 100755
--- a/z-devel/perforce-server/INSTALL
+++ b/z-devel/perforce-server/INSTALL
@@ -1 +1,24 @@
-true
+groupadd perforce 2>/dev/null
+mkdir /home/perforce 2>/dev/null
+useradd -g perforce perforce 2>/dev/null
+
+P4_HOME=~perforce
+
+install -m 755 p4d /usr/bin/p4d &&
+install -m 755 -d -o perforce -g perforce $P4_HOME/p4root &&
+
+# The other files should only be updated if they don't already exist
+
+if [ ! -f /etc/p4d.conf ]; then
+ install -m 644 $SCRIPT_DIRECTORY/p4d.conf /etc/p4d.conf
+fi
+
+if [ ! -f /$P4_HOME/.p4config ]; then
+ install -m 644 -o perforce -g perforce $SCRIPT_DIRECTORY/p4config \
+ /$P4_HOME/.p4config
+fi
+
+if [ ! -f $P4_HOME/scripts/backup.sh ]; then
+ install -m 755 -D -o perforce -g perforce
$SCRIPT_DIRECTORY/backup.sh \
+ $P4_HOME/scripts/backup.sh
+fi
diff --git a/z-devel/perforce-server/PRE_REMOVE
b/z-devel/perforce-server/PRE_REMOVE
deleted file mode 100755
index 78daba7..0000000
--- a/z-devel/perforce-server/PRE_REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-# If they're still using the old init script we need to use that to do
-# the shutdown. We'll look for /etc/init.d/p4d.sh to decide
-if [ -x /etc/init.d/p4d.sh ]; then
- /etc/init.d/p4d.sh stop
-else
- telinit run p4d stop
-fi



  • [SM-Commit] GIT changes to master z-rejected grimoire by Treeve Jelbert (707c7fe39032978f73aa6d800c5c95908bdbe9d4), Treeve Jelbert, 07/28/2006

Archive powered by MHonArc 2.6.24.

Top of Page