pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/parallel/dqs Support staged installation.
details: https://anonhg.NetBSD.org/pkgsrc/rev/44b7022e5b85
branches: trunk
changeset: 568317:44b7022e5b85
user: asau <asau%pkgsrc.org@localhost>
date: Thu Dec 10 21:19:16 2009 +0000
description:
Support staged installation.
diffstat:
parallel/dqs/Makefile | 8 +-
parallel/dqs/distinfo | 5 +-
parallel/dqs/patches/patch-aa | 36 ++++++++++-
parallel/dqs/patches/patch-ai | 124 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 163 insertions(+), 10 deletions(-)
diffs (236 lines):
diff -r 1ed5b58200b8 -r 44b7022e5b85 parallel/dqs/Makefile
--- a/parallel/dqs/Makefile Thu Dec 10 21:13:07 2009 +0000
+++ b/parallel/dqs/Makefile Thu Dec 10 21:19:16 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/07/05 18:13:37 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2009/12/10 21:19:16 asau Exp $
#
DISTNAME= DQS-3.3.2
@@ -12,6 +12,8 @@
HOMEPAGE= http://web.archive.org/web/20050305104643/http://www.scri.fsu.edu/~pasko/dqs.html
COMMENT= Distributed queueing system
+PKG_DESTDIR_SUPPORT= destdir # needs special permissions handling
+
WRKSRC= ${WRKDIR}/DQS3
DOCDIR= ${PREFIX}/share/doc/dqs
DOCS= Image16.gif Image17.gif Image18.gif Image19.gif Image20.gif \
@@ -33,9 +35,9 @@
${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/UTIL/config.sub
post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
.for doc in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/DOC/user_guide/${doc} ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/DOC/user_guide/${doc} ${DESTDIR}${DOCDIR}
.endfor
.include "../../mk/bsd.pkg.mk"
diff -r 1ed5b58200b8 -r 44b7022e5b85 parallel/dqs/distinfo
--- a/parallel/dqs/distinfo Thu Dec 10 21:13:07 2009 +0000
+++ b/parallel/dqs/distinfo Thu Dec 10 21:19:16 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2006/06/04 12:57:11 joerg Exp $
+$NetBSD: distinfo,v 1.8 2009/12/10 21:19:16 asau Exp $
SHA1 (DQS-3.3.2.tgz) = fbb165cc058dcbda8bcfa6dbead78e2f1a4f031e
RMD160 (DQS-3.3.2.tgz) = eb32ef1cd8243b508fbee91710982637de185b7a
Size (DQS-3.3.2.tgz) = 1498996 bytes
-SHA1 (patch-aa) = 0b9880000157f2c9795991d1441ccd48e817d300
+SHA1 (patch-aa) = f5c4ec9c4be1b55edd82dabfe75445bcf76e62b2
SHA1 (patch-ab) = 8cb54cb86c7558da60ff6fb329ca71a671a0dded
SHA1 (patch-ac) = c72be633789525f73bb0e1415ff7b300b7576e7e
SHA1 (patch-ad) = 6a7116cf60b9d4305257b233f2bc3dbeeddfc069
@@ -11,3 +11,4 @@
SHA1 (patch-af) = 41081707b3b4cbb2a5cd78adcd983f029362389e
SHA1 (patch-ag) = 76a7c43036a5be2952a1822e0871bc3dabb8806c
SHA1 (patch-ah) = 8d1a43c595981e0f148f44a3f5edb5368f18b5cb
+SHA1 (patch-ai) = 4f149830147bac0aaded8f1aa7430336e73531c2
diff -r 1ed5b58200b8 -r 44b7022e5b85 parallel/dqs/patches/patch-aa
--- a/parallel/dqs/patches/patch-aa Thu Dec 10 21:13:07 2009 +0000
+++ b/parallel/dqs/patches/patch-aa Thu Dec 10 21:19:16 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/26 20:23:42 agc Exp $
+$NetBSD: patch-aa,v 1.2 2009/12/10 21:19:16 asau Exp $
---- Makefile 2002/09/18 11:06:36 1.1
-+++ Makefile 2002/09/18 11:08:07
+--- Makefile.orig 1998-10-21 21:39:14.000000000 +0400
++++ Makefile 2009-12-10 03:53:59.000000000 +0300
@@ -1,10 +1,10 @@
-INSTALL_DIR=/usr/local/DQS/bin
-BIN_DIR=/usr/local/DQS/bin
@@ -20,7 +20,7 @@
ROOT=0
DQS_ROOT=0
SYSGRP=0
-@@ -17,7 +17,7 @@
+@@ -17,17 +17,17 @@
# sets up an arc dependant subdirectory under DQS/ARCS
# ans builds the default distribution
@@ -29,7 +29,33 @@
UTIL/make_arcs make CC=$(CC) -f Makefile
#******************************************************
-@@ -76,7 +76,7 @@
+ # dirs - Make Install Directories
+
+ dirs:
+- -mkdir -p $(INSTALL_DIR) $(ARC_DIR) $(BIN_DIR)
+- -mkdir -p $(DOC_DIR) $(LIB_DIR) $(MAN1_DIR) $(MAN3_DIR)
+- -mkdir -p $(CONF_DIR)
+- -chmod 755 $(CONF_DIR)
++ -mkdir -p $(DESTDIR)$(INSTALL_DIR) $(DESTDIR)$(ARC_DIR) $(DESTDIR)$(BIN_DIR)
++ -mkdir -p $(DESTDIR)$(DOC_DIR) $(DESTDIR)$(LIB_DIR) $(DESTDIR)$(MAN1_DIR) $(DESTDIR)$(MAN3_DIR)
++ -mkdir -p $(DESTDIR)$(CONF_DIR)
++ -chmod 755 $(DESTDIR)$(CONF_DIR)
+
+ #******************************************************
+ # config - Configure DQS
+@@ -67,16 +67,16 @@
+
+ installconf: dirs
+ UTIL/install -o $(DQS_ROOT) -g $(DQS_SYSGRP) \
+- -m 744 SRC/conf_file $(CONF_DIR)/conf_file
++ -m 744 SRC/conf_file $(DESTDIR)$(CONF_DIR)/conf_file
+ UTIL/install -o $(DQS_ROOT) -g $(DQS_SYSGRP) \
+- -m 744 SRC/resolve_file $(CONF_DIR)/resolve_file
++ -m 744 SRC/resolve_file $(DESTDIR)$(CONF_DIR)/resolve_file
+ UTIL/install -o $(DQS_ROOT) -g $(DQS_SYSGRP) \
+- -m 700 SRC/key_file $(CONF_DIR)/key_file
++ -m 700 SRC/key_file $(DESTDIR)$(CONF_DIR)/key_file
+
#******************************************************
# installall
diff -r 1ed5b58200b8 -r 44b7022e5b85 parallel/dqs/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/dqs/patches/patch-ai Thu Dec 10 21:19:16 2009 +0000
@@ -0,0 +1,124 @@
+$NetBSD: patch-ai,v 1.1 2009/12/10 21:19:16 asau Exp $
+
+Staged installation (DESTDIR) support.
+
+--- SRC/Makefile.proto.orig 2000-12-11 06:02:19.000000000 +0300
++++ SRC/Makefile.proto 2009-12-10 04:08:35.000000000 +0300
+@@ -764,75 +764,75 @@
+ -rm -f $(BIN_DIR)/QMASTER_BIN $(BIN_DIR)/DSH_BIN
+ -rm -f $(BIN_DIR)/PVM_CLEAN
+
+-installbin:: $(BIN_DIR)/QMASTER_BIN $(BIN_DIR)/QSUB_BIN $(BIN_DIR)/QSTAT_BIN
++installbin:: $(DESTDIR)$(BIN_DIR)/QMASTER_BIN $(DESTDIR)$(BIN_DIR)/QSUB_BIN $(DESTDIR)$(BIN_DIR)/QSTAT_BIN
+
+-installbin:: $(BIN_DIR)/DQS_EXECD_BIN $(BIN_DIR)/QDEL_BIN $(BIN_DIR)/QCONF_BIN
++installbin:: $(DESTDIR)$(BIN_DIR)/DQS_EXECD_BIN $(DESTDIR)$(BIN_DIR)/QDEL_BIN $(DESTDIR)$(BIN_DIR)/QCONF_BIN
+
+-installbin:: $(BIN_DIR)/QMOD_BIN $(BIN_DIR)/DQS_OPTIONS_BIN $(BIN_DIR)/QALTER_BIN
++installbin:: $(DESTDIR)$(BIN_DIR)/QMOD_BIN $(DESTDIR)$(BIN_DIR)/DQS_OPTIONS_BIN $(DESTDIR)$(BIN_DIR)/QALTER_BIN
+
+-installbin:: $(BIN_DIR)/DSH_BIN $(BIN_DIR)/DQS_RANDOM_BIN $(BIN_DIR)/DQS_TIMES_BIN
++installbin:: $(DESTDIR)$(BIN_DIR)/DSH_BIN $(DESTDIR)$(BIN_DIR)/DQS_RANDOM_BIN $(DESTDIR)$(BIN_DIR)/DQS_TIMES_BIN
+
+-installbin:: $(BIN_DIR)/QHOLD_BIN $(BIN_DIR)/QRLS_BIN $(BIN_DIR)/QMOVE_BIN $(BIN_DIR)/PVM_CLEAN
++installbin:: $(DESTDIR)$(BIN_DIR)/QHOLD_BIN $(DESTDIR)$(BIN_DIR)/QRLS_BIN $(DESTDIR)$(BIN_DIR)/QMOVE_BIN $(DESTDIR)$(BIN_DIR)/PVM_CLEAN
+
+-installlib:: $(LIB_DIR)/dqs_ckpt.a
++installlib:: $(DESTDIR)$(LIB_DIR)/dqs_ckpt.a
+
+ wc :
+ wc -l $(LSRC) $(MSRC) $(HDRS) Makefile Makefile.proto
+
+-$(BIN_DIR)/QACCT_BIN: qacct
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 755 qacct $(BIN_DIR)/QACCT_BIN
++$(DESTDIR)$(BIN_DIR)/QACCT_BIN: qacct
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 755 qacct $(DESTDIR)$(BIN_DIR)/QACCT_BIN
+
+-$(BIN_DIR)/QALTER_BIN: qalter
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qalter $(BIN_DIR)/QALTER_BIN
++$(DESTDIR)$(BIN_DIR)/QALTER_BIN: qalter
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qalter $(DESTDIR)$(BIN_DIR)/QALTER_BIN
+
+-$(BIN_DIR)/QMASTER_BIN: qmaster
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0700 qmaster $(BIN_DIR)/QMASTER_BIN
++$(DESTDIR)$(BIN_DIR)/QMASTER_BIN: qmaster
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0700 qmaster $(DESTDIR)$(BIN_DIR)/QMASTER_BIN
+
+-$(BIN_DIR)/QHOLD_BIN: qhold
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qhold $(BIN_DIR)/QHOLD_BIN
++$(DESTDIR)$(BIN_DIR)/QHOLD_BIN: qhold
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qhold $(DESTDIR)$(BIN_DIR)/QHOLD_BIN
+
+-$(BIN_DIR)/QRLS_BIN: qrls
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qrls $(BIN_DIR)/QRLS_BIN
++$(DESTDIR)$(BIN_DIR)/QRLS_BIN: qrls
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qrls $(DESTDIR)$(BIN_DIR)/QRLS_BIN
+
+-$(BIN_DIR)/QSUB_BIN: qsub
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qsub $(BIN_DIR)/QSUB_BIN
++$(DESTDIR)$(BIN_DIR)/QSUB_BIN: qsub
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qsub $(DESTDIR)$(BIN_DIR)/QSUB_BIN
+
+-$(BIN_DIR)/QSTAT_BIN: qstat
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qstat $(BIN_DIR)/QSTAT_BIN
++$(DESTDIR)$(BIN_DIR)/QSTAT_BIN: qstat
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qstat $(DESTDIR)$(BIN_DIR)/QSTAT_BIN
+
+-$(BIN_DIR)/QCONF_BIN: qconf
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qconf $(BIN_DIR)/QCONF_BIN
++$(DESTDIR)$(BIN_DIR)/QCONF_BIN: qconf
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qconf $(DESTDIR)$(BIN_DIR)/QCONF_BIN
+
+-$(BIN_DIR)/DQS_EXECD_BIN: dqs_execd
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 dqs_execd $(BIN_DIR)/DQS_EXECD_BIN
++$(DESTDIR)$(BIN_DIR)/DQS_EXECD_BIN: dqs_execd
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 dqs_execd $(DESTDIR)$(BIN_DIR)/DQS_EXECD_BIN
+
+-$(BIN_DIR)/PVM_CLEAN: ../UTIL/pvmcleanup.sh
++$(DESTDIR)$(BIN_DIR)/PVM_CLEAN: ../UTIL/pvmcleanup.sh
+ cp ../UTIL/pvmcleanup.sh .
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 pvmcleanup.sh $(BIN_DIR)/PVM_CLEAN
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 pvmcleanup.sh $(DESTDIR)$(BIN_DIR)/PVM_CLEAN
+
+-$(BIN_DIR)/DSH_BIN: dsh
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 dsh $(BIN_DIR)/DSH_BIN
++$(DESTDIR)$(BIN_DIR)/DSH_BIN: dsh
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 dsh $(DESTDIR)$(BIN_DIR)/DSH_BIN
+
+-$(BIN_DIR)/QMOD_BIN: qmod
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qmod $(BIN_DIR)/QMOD_BIN
++$(DESTDIR)$(BIN_DIR)/QMOD_BIN: qmod
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qmod $(DESTDIR)$(BIN_DIR)/QMOD_BIN
+
+-$(BIN_DIR)/QDEL_BIN: qdel
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qdel $(BIN_DIR)/QDEL_BIN
++$(DESTDIR)$(BIN_DIR)/QDEL_BIN: qdel
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qdel $(DESTDIR)$(BIN_DIR)/QDEL_BIN
+
+-$(BIN_DIR)/QMOVE_BIN: qmove
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qmove $(BIN_DIR)/QMOVE_BIN
++$(DESTDIR)$(BIN_DIR)/QMOVE_BIN: qmove
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qmove $(DESTDIR)$(BIN_DIR)/QMOVE_BIN
+
+-$(BIN_DIR)/DQS_OPTIONS_BIN: dqs_options
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 dqs_options $(BIN_DIR)/DQS_OPTIONS_BIN
++$(DESTDIR)$(BIN_DIR)/DQS_OPTIONS_BIN: dqs_options
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 dqs_options $(DESTDIR)$(BIN_DIR)/DQS_OPTIONS_BIN
+
+-$(BIN_DIR)/DQS_RANDOM_BIN: dqs_random
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 dqs_random $(BIN_DIR)/DQS_RANDOM_BIN
++$(DESTDIR)$(BIN_DIR)/DQS_RANDOM_BIN: dqs_random
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 dqs_random $(DESTDIR)$(BIN_DIR)/DQS_RANDOM_BIN
+
+-$(BIN_DIR)/DQS_TIMES_BIN:
+- $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 $(SDIR)/dqs_times $(BIN_DIR)/DQS_TIMES_BIN
++$(DESTDIR)$(BIN_DIR)/DQS_TIMES_BIN:
++ $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 $(SDIR)/dqs_times $(DESTDIR)$(BIN_DIR)/DQS_TIMES_BIN
+
+-$(LIB_DIR)/dqs_ckpt.a: dqs_ckpt.a
+- $(INSTALL) -o $(ROOT) -g $(SYSGRP) -m 644 dqs_ckpt.a $(LIB_DIR)/dqs_ckpt.a
++$(DESTDIR)$(LIB_DIR)/dqs_ckpt.a: dqs_ckpt.a
++ $(INSTALL) -o $(ROOT) -g $(SYSGRP) -m 644 dqs_ckpt.a $(DESTDIR)$(LIB_DIR)/dqs_ckpt.a
+
+ /*************************************************************************/
+
Home |
Main Index |
Thread Index |
Old Index