Sun Apr 15 04:07:21 2012 UTC ()
Reinstate patch-source-utilbin_Makefile (aka patch-ak)
Dont install *.orig files
Fix build on 64bit systems
Fix arch name for Linux
Bump PKGREVISION


(markd)
diff -r1.43 -r1.44 pkgsrc/parallel/sge/Makefile
diff -r1.7 -r1.8 pkgsrc/parallel/sge/PLIST
diff -r1.14 -r1.15 pkgsrc/parallel/sge/distinfo
diff -r1.7 -r1.8 pkgsrc/parallel/sge/patches/patch-am
diff -r0 -r1.1 pkgsrc/parallel/sge/patches/patch-source-utilbin_Makefile
diff -r0 -r1.1 pkgsrc/parallel/sge/patches/patch-source_3rdparty_sge_depend_def.h
cvs diff -r1.43 -r1.44 pkgsrc/parallel/sge/Makefile (expand / switch to unified diff)

--- pkgsrc/parallel/sge/Makefile 2012/04/07 22:19:13 1.43
+++ pkgsrc/parallel/sge/Makefile 2012/04/15 04:07:21 1.44
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.43 2012/04/07 22:19:13 dholland Exp $ 1# $NetBSD: Makefile,v 1.44 2012/04/15 04:07:21 markd Exp $
2# 2#
3 3
4DISTNAME= sge-8.0.0d 4DISTNAME= sge-8.0.0d
5PKGNAME= sge-8.0.0.4 5PKGNAME= sge-8.0.0.4
 6PKGREVISION= 1
6CATEGORIES= parallel sysutils 7CATEGORIES= parallel sysutils
7MASTER_SITES= http://arc.liv.ac.uk/downloads/SGE/releases/8.0.0d/ 8MASTER_SITES= http://arc.liv.ac.uk/downloads/SGE/releases/8.0.0d/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://arc.liv.ac.uk/trac/SGE 11HOMEPAGE= https://arc.liv.ac.uk/trac/SGE
11COMMENT= Son of Grid Engine distributed resource management system 12COMMENT= Son of Grid Engine distributed resource management system
12 13
13BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh 14BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17# Not 64-bit clean; crashes during build. 
18NOT_FOR_PLATFORM= ${LP64PLATFORMS} 
19 
20GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
21USE_TOOLS+= gmake perl:run 19USE_TOOLS+= gmake perl:run
22 20
 21MANINSTALL= maninstall catinstall
 22
23CFLAGS+= -D${UPPER_OPSYS} 23CFLAGS+= -D${UPPER_OPSYS}
24CONFIGURE_ENV+= REMOTE=sge 24CONFIGURE_ENV+= REMOTE=sge
25CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q} 25CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
26CONFIGURE_ARGS+= --with-sge=${SGE_BUILDARCH:Q} 26CONFIGURE_ARGS+= --with-sge=${SGE_BUILDARCH:Q}
27PLIST_SUBST+= SGE_ARCH=${SGE_ARCH:Q} 27PLIST_SUBST+= SGE_ARCH=${SGE_ARCH:Q}
28MESSAGE_SUBST+= SGE_ROOT=${SGE_ROOT} 28MESSAGE_SUBST+= SGE_ROOT=${SGE_ROOT}
29MAKE_ENV+= PERL5=${PERL5:Q} 29MAKE_ENV+= PERL5=${PERL5:Q}
30 30
31SGE_USER?= sgeadmin 31SGE_USER?= sgeadmin
32SGE_GROUP?= sgeadmin 32SGE_GROUP?= sgeadmin
33PKG_GROUPS= ${SGE_GROUP} 33PKG_GROUPS= ${SGE_GROUP}
34PKG_USERS= ${SGE_USER}:${SGE_GROUP}::Sun\ Grid\ Engine\ Administrator 34PKG_USERS= ${SGE_USER}:${SGE_GROUP}::Sun\ Grid\ Engine\ Administrator
35PKG_GROUPS_VARS+= SGE_GROUP 35PKG_GROUPS_VARS+= SGE_GROUP
@@ -40,28 +40,26 @@ EVAL_PREFIX+= PKGSRC_SSL_PREFIX=openssl @@ -40,28 +40,26 @@ EVAL_PREFIX+= PKGSRC_SSL_PREFIX=openssl
40AIMK= ${SETENV} ${MAKE_ENV} tcsh -fb ${WRKSRC}/source/aimk 40AIMK= ${SETENV} ${MAKE_ENV} tcsh -fb ${WRKSRC}/source/aimk
41 41
42CONFIG_GUESS_OVERRIDE= source/3rdparty/qmake/config.guess \ 42CONFIG_GUESS_OVERRIDE= source/3rdparty/qmake/config.guess \
43 source/3rdparty/qtcsh/config.guess 43 source/3rdparty/qtcsh/config.guess
44CONFIG_SUB_OVERRIDE= source/3rdparty/qmake/config.sub \ 44CONFIG_SUB_OVERRIDE= source/3rdparty/qmake/config.sub \
45 source/3rdparty/qtcsh/config.sub 45 source/3rdparty/qtcsh/config.sub
46 46
47REPLACE_INTERPRETER+= tclsh 47REPLACE_INTERPRETER+= tclsh
48REPLACE.tclsh.old= .*tclsh 48REPLACE.tclsh.old= .*tclsh
49REPLACE.tclsh.new= ${PREFIX}/bin/tclsh 49REPLACE.tclsh.new= ${PREFIX}/bin/tclsh
50REPLACE_FILES.tclsh= source/dist/util/resources/jsv/jsv.tcl 50REPLACE_FILES.tclsh= source/dist/util/resources/jsv/jsv.tcl
51REPLACE_PERL+= source/dist/util/resources/jsv/jsv.pl 51REPLACE_PERL+= source/dist/util/resources/jsv/jsv.pl
52 52
53CHECK_INTERPRETER_SKIP+= sge/ckpt/cpr_* sge/mpi/myrinet/* sge/util/resources/loadsensors/interix-loadsensor.sh 
54 
55.include "../../mk/bsd.prefs.mk" 53.include "../../mk/bsd.prefs.mk"
56 54
57# SGE_ARCH should match the putput of ${WRKSRC}/source/dist/util/arch 55# SGE_ARCH should match the putput of ${WRKSRC}/source/dist/util/arch
58# SGE_BUILDARCH should match whats in ${WRKSRC}/source/aimk 56# SGE_BUILDARCH should match whats in ${WRKSRC}/source/aimk
59UPPER_OPSYS_cmd= ${ECHO} "${OPSYS}" | ${TR} a-z A-Z 57UPPER_OPSYS_cmd= ${ECHO} "${OPSYS}" | ${TR} a-z A-Z
60UPPER_OPSYS= ${UPPER_OPSYS_cmd:sh} 58UPPER_OPSYS= ${UPPER_OPSYS_cmd:sh}
61 59
62.if ${OPSYS} == "NetBSD" 60.if ${OPSYS} == "NetBSD"
63AIMK+= -DFD_SETSIZE=2048 61AIMK+= -DFD_SETSIZE=2048
64SGE_ARCH= nbsd-${MACHINE_ARCH} 62SGE_ARCH= nbsd-${MACHINE_ARCH}
65SGE_BUILDARCH_cmd= ${ECHO} "${OPSYS}_${MACHINE_ARCH}" | ${TR} a-z A-Z 63SGE_BUILDARCH_cmd= ${ECHO} "${OPSYS}_${MACHINE_ARCH}" | ${TR} a-z A-Z
66.elif ${OPSYS} == "FreeBSD" 64.elif ${OPSYS} == "FreeBSD"
67SGE_ARCH= fbsd-${MACHINE_ARCH} 65SGE_ARCH= fbsd-${MACHINE_ARCH}
@@ -73,90 +71,94 @@ SGE_ARCH= solaris86 @@ -73,90 +71,94 @@ SGE_ARCH= solaris86
73_ISAINFO!= isainfo 71_ISAINFO!= isainfo
74. if !empty(_ISAINFO:Msparcv9) 72. if !empty(_ISAINFO:Msparcv9)
75SGE_ARCH= solaris64 73SGE_ARCH= solaris64
76. else 74. else
77SGE_ARCH= solaris 75SGE_ARCH= solaris
78. endif 76. endif
79. endif 77. endif
80SGE_BUILDARCH_cmd= ${ECHO} "${SGE_ARCH}" | ${TR} a-z A-Z 78SGE_BUILDARCH_cmd= ${ECHO} "${SGE_ARCH}" | ${TR} a-z A-Z
81.elif ${OPSYS} == "Darwin" 79.elif ${OPSYS} == "Darwin"
82SGE_ARCH= darwin 80SGE_ARCH= darwin
83SGE_BUILDARCH= DARWIN 81SGE_BUILDARCH= DARWIN
84.elif ${OPSYS} == "Linux" 82.elif ${OPSYS} == "Linux"
85AIMK+= -no-dump 83AIMK+= -no-dump
86SGE_ARCH= lx26-x86 84SGE_ARCH= lx-x86
87SGE_BUILDARCH= LINUX86 85SGE_BUILDARCH= LINUX86
88.else 86.else
89PKG_FAIL_REASON+= "SGE_ARCH and SGE_BUILDARCH need to be configured for your OS" 87PKG_FAIL_REASON+= "SGE_ARCH and SGE_BUILDARCH need to be configured for your OS"
90.endif 88.endif
91SGE_BUILDARCH?= ${SGE_BUILDARCH_cmd:sh} 89SGE_BUILDARCH?= ${SGE_BUILDARCH_cmd:sh}
92 90
93# Some hacks to get it properly linked: 91# Some hacks to get it properly linked:
94MAKE_ENV+= SGE_ARCH=$(SGE_ARCH) SGE_ROOT=$(SGE_ROOT) 92MAKE_ENV+= SGE_ARCH=${SGE_ARCH} SGE_ROOT=${SGE_ROOT}
95 93
96LDFLAGS+= -R${SGE_ROOT}/lib/${SGE_ARCH} 94LDFLAGS+= ${COMPILER_RPATH_FLAG}${SGE_ROOT}/lib/${SGE_ARCH}
97BUILDLINK_PASSTHRU_RPATHDIRS+= ${SGE_ROOT}/lib/${SGE_ARCH} 95BUILDLINK_PASSTHRU_RPATHDIRS+= ${SGE_ROOT}/lib/${SGE_ARCH}
98 96
99SGE_ROOT= ${PREFIX}/sge 97SGE_ROOT= ${PREFIX}/sge
100 98
101INSTALLATION_DIRS= bin 99INSTALLATION_DIRS= bin
102 100
103post-patch: 101post-patch:
104 @if [ "`${WRKSRC}/source/dist/util/arch`" != "${SGE_ARCH}" ]; then \ 102 @if [ "`${WRKSRC}/source/dist/util/arch`" != "${SGE_ARCH}" ]; then \
105 ${ECHO} "ERROR: SGE_ARCH as set in the pkgsrc Makefile," ;\ 103 ${ECHO} "ERROR: SGE_ARCH as set in the pkgsrc Makefile," ;\
106 ${ECHO} " ${SGE_ARCH}, does not agree with that returned by" ; \ 104 ${ECHO} " ${SGE_ARCH}, does not agree with that returned by" ; \
107 ${ECHO} " ${WRKSRC}/source/dist/util/arch," ; \ 105 ${ECHO} " ${WRKSRC}/source/dist/util/arch," ; \
108 ${ECHO} " `${WRKSRC}/source/dist/util/arch`" ; \ 106 ${ECHO} " `${WRKSRC}/source/dist/util/arch`" ; \
109 ${FALSE} ; \ 107 ${FALSE} ; \
110 fi 108 fi
111 ( ${ECHO} "set OPENSSL_HOME = ${SSL_PREFIX}" ; \ 109 ( ${ECHO} "set OPENSSL_HOME = ${SSL_PREFIX}" ; \
112 ${ECHO} "set BERKELEYDB_HOME = ${BUILDLINK_PREFIX.db4}" ; \ 110 ${ECHO} "set BERKELEYDB_HOME = ${BUILDLINK_PREFIX.db4}" ; \
113 ${ECHO} "set BDB_INCLUDE_SUBDIR = db4" ; \ 111 ${ECHO} "set BDB_INCLUDE_SUBDIR = db4" ; \
114 ${ECHO} "set BDB_LIB_SUFFIX = 4" ; \ 112 ${ECHO} "set BDB_LIB_SUFFIX = 4" ; \
115 ${ECHO} "set PERL = ${PERL5}" ) > ${WRKSRC}/source/aimk.private 113 ${ECHO} "set PERL = ${PERL5}" ) > ${WRKSRC}/source/aimk.private
116 ( ${ECHO} "OPENSSLBASE=${SSL_PREFIX}" ; \ 114 ( ${ECHO} "OPENSSLBASE=${SSL_PREFIX}" ; \
117 ${ECHO} "BERKELEYDBBASE=${BUILDLINK_PREFIX.db4}" ) > ${WRKSRC}/source/distinst.private 115 ${ECHO} "BERKELEYDBBASE=${BUILDLINK_PREFIX.db4}" ) > ${WRKSRC}/source/distinst.private
 116 rm ${WRKSRC}/source/dist/util/*.orig
118 117
119SUBST_CLASSES+= paths 118SUBST_CLASSES+= paths
120SUBST_STAGE.paths= post-patch 119SUBST_STAGE.paths= post-patch
121SUBST_FILES.paths= source/dist/util/arch_variables 120SUBST_FILES.paths= source/dist/util/arch_variables
122SUBST_SED.paths= -e 's;@rcd_dir@;${RCD_SCRIPTS_DIR};'  121SUBST_SED.paths= -e 's;@rcd_dir@;${RCD_SCRIPTS_DIR};'
123 122
124do-configure: 123do-configure:
125.for __prog__ in qmake qtcsh 124.for __prog__ in qmake qtcsh
126 ${MKDIR} ${WRKSRC}/source/3rdparty/${__prog__}/${SGE_BUILDARCH} 125 ${MKDIR} ${WRKSRC}/source/3rdparty/${__prog__}/${SGE_BUILDARCH}
127 cd ${WRKSRC}/source/3rdparty/${__prog__}/${SGE_BUILDARCH} && \ 126 cd ${WRKSRC}/source/3rdparty/${__prog__}/${SGE_BUILDARCH} && \
128 ${SETENV} ${CONFIGURE_ENV} \ 127 ${SETENV} ${CONFIGURE_ENV} \
129 SGE_ARCH=`${WRKSRC}/source/dist/util/arch` \ 128 SGE_ARCH=`${WRKSRC}/source/dist/util/arch` \
130 ../configure ${CONFIGURE_ARGS} --srcdir=.. 129 ../configure ${CONFIGURE_ARGS} --srcdir=..
131.endfor 130.endfor
132 131
133do-build: 132do-build:
134 cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -only-depend 133 cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -no-hwloc -only-depend
135 cd ${WRKSRC}/source && ${SETENV} ${MAKE_ENV} ./scripts/zerodepend 134 cd ${WRKSRC}/source && ${SETENV} ${MAKE_ENV} ./scripts/zerodepend
136 cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -no-qmake -no-qtcsh depend 135 cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -no-hwloc -no-qmake -no-qtcsh depend
137 cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni 136 cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -no-hwloc
138 cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -man -sunman 137 cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -no-hwloc -man
139 138
140CHECK_INTERPRETER_SKIP= sge/bin/process-scheduler-log \ 139CHECK_INTERPRETER_SKIP= sge/bin/process-scheduler-log \
141 sge/bin/qsched \ 140 sge/bin/qsched \
142 sge/bin/status \ 141 sge/bin/status \
 142 sge/ckpt/cpr_* \
143 sge/examples/drmaa/ruby/* \ 143 sge/examples/drmaa/ruby/* \
144 sge/hadoop/pestart.sh \ 144 sge/hadoop/pestart.sh \
145 sge/hadoop/pestop.sh \ 145 sge/hadoop/pestop.sh \
146 sge/hadoop/setup.pl \ 146 sge/hadoop/setup.pl \
147 sge/hadoop/wait.sh \ 147 sge/hadoop/wait.sh \
 148 sge/mpi/myrinet/* \
148 sge/util/resources/drmaa4ruby/* \ 149 sge/util/resources/drmaa4ruby/* \
149 sge/util/resources/drmaa4ruby/samples/* \ 150 sge/util/resources/drmaa4ruby/samples/* \
 151 sge/util/resources/loadsensors/interix-loadsensor.sh \
150 sge/util/resources/wrappers/rshd-wrapper 152 sge/util/resources/wrappers/rshd-wrapper
151 153
152do-install: 154do-install:
153 ${MKDIR} ${DESTDIR}${SGE_ROOT} 155 ${MKDIR} ${DESTDIR}${SGE_ROOT}
154 #${CHOWN} ${SGE_USER} ${DESTDIR}${SGE_ROOT} 156 #${CHOWN} ${SGE_USER} ${DESTDIR}${SGE_ROOT}
155 #${CHGRP} ${SGE_GROUP} ${DESTDIR}${SGE_ROOT} 157 #${CHGRP} ${SGE_GROUP} ${DESTDIR}${SGE_ROOT}
156 cd ${WRKSRC}/source && \ 158 cd ${WRKSRC}/source && \
157 ${ECHO} "Y" | ${SETENV} LOCALBASE=${LOCALBASE} DESTDIR=${DESTDIR} SGE_ROOT=${SGE_ROOT} ./scripts/distinst -local -all -nobdb -noopenssl -mansrc sge ${SGE_ARCH} -- doc man 159 ${ECHO} "Y" | ${SETENV} LOCALBASE=${LOCALBASE} DESTDIR=${DESTDIR} SGE_ROOT=${SGE_ROOT} ./scripts/distinst -local -all -nobdb -noopenssl -mansrc sge ${SGE_ARCH} -- doc man
158 for f in archive checkpoint deadlock dump load printlog recover stat upgrade verify ; do \ 160 for f in archive checkpoint deadlock dump load printlog recover stat upgrade verify ; do \
159 ln -s ${DESTDIR}${LOCALBASE}/bin/db4_$${f} ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/db_$${f} ; done 161 ln -s ${DESTDIR}${LOCALBASE}/bin/db4_$${f} ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/db_$${f} ; done
160 ln -s ${DESTDIR}${LOCALBASE}/bin/berkeley_db4_svc ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/berkeley_db_svc 162 ln -s ${DESTDIR}${LOCALBASE}/bin/berkeley_db4_svc ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/berkeley_db_svc
161 ln -s ${DESTDIR}${SSL_PREFIX}/bin/openssl ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl 163 ln -s ${DESTDIR}${SSL_PREFIX}/bin/openssl ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl
162 cd ${DESTDIR}${SGE_ROOT} && ${SETENV} SGE_ROOT=${SGE_ROOT} DESTDIR=${DESTDIR} ./util/setfileperm.sh -auto \ 164 cd ${DESTDIR}${SGE_ROOT} && ${SETENV} SGE_ROOT=${SGE_ROOT} DESTDIR=${DESTDIR} ./util/setfileperm.sh -auto \
cvs diff -r1.7 -r1.8 pkgsrc/parallel/sge/PLIST (expand / switch to unified diff)

--- pkgsrc/parallel/sge/PLIST 2012/03/20 17:07:43 1.7
+++ pkgsrc/parallel/sge/PLIST 2012/04/15 04:07:21 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.7 2012/03/20 17:07:43 asau Exp $ 1@comment $NetBSD: PLIST,v 1.8 2012/04/15 04:07:21 markd Exp $
2bin/qacct 2bin/qacct
3bin/qalter 3bin/qalter
4bin/qconf 4bin/qconf
5bin/qdel 5bin/qdel
6bin/qevent 6bin/qevent
7bin/qhold 7bin/qhold
8bin/qhost 8bin/qhost
9bin/qlogin 9bin/qlogin
10bin/qmake 10bin/qmake
11bin/qmod 11bin/qmod
12bin/qmon 12bin/qmon
13bin/qping 13bin/qping
14bin/qquota 14bin/qquota
@@ -538,27 +538,26 @@ sge/qmon/PIXMAPS/xterm-dec.xpm @@ -538,27 +538,26 @@ sge/qmon/PIXMAPS/xterm-dec.xpm
538sge/qmon/PIXMAPS/xterm-hp.xpm 538sge/qmon/PIXMAPS/xterm-hp.xpm
539sge/qmon/PIXMAPS/xterm-ibm.xpm 539sge/qmon/PIXMAPS/xterm-ibm.xpm
540sge/qmon/PIXMAPS/xterm-linux.xpm 540sge/qmon/PIXMAPS/xterm-linux.xpm
541sge/qmon/PIXMAPS/xterm-sgi.xpm 541sge/qmon/PIXMAPS/xterm-sgi.xpm
542sge/qmon/PIXMAPS/xterm-sgi1.xpm 542sge/qmon/PIXMAPS/xterm-sgi1.xpm
543sge/qmon/PIXMAPS/xterm-sol.xpm 543sge/qmon/PIXMAPS/xterm-sol.xpm
544sge/qmon/PIXMAPS/xterm-sun.xpm 544sge/qmon/PIXMAPS/xterm-sun.xpm
545sge/qmon/PIXMAPS/xterm.xpm 545sge/qmon/PIXMAPS/xterm.xpm
546sge/qmon/Qmon 546sge/qmon/Qmon
547sge/qmon/qmon_help.ad 547sge/qmon/qmon_help.ad
548sge/start_gui_installer 548sge/start_gui_installer
549sge/util/arch 549sge/util/arch
550sge/util/arch_variables 550sge/util/arch_variables
551sge/util/arch_variables.orig 
552sge/util/certtool.sh 551sge/util/certtool.sh
553sge/util/create_settings.sh 552sge/util/create_settings.sh
554sge/util/dl.csh 553sge/util/dl.csh
555sge/util/dl.sh 554sge/util/dl.sh
556sge/util/dl1.csh 555sge/util/dl1.csh
557sge/util/dl2.csh 556sge/util/dl2.csh
558sge/util/gui-installer/html/en/help/CSPConfig.html 557sge/util/gui-installer/html/en/help/CSPConfig.html
559sge/util/gui-installer/html/en/help/ChooseComp.html 558sge/util/gui-installer/html/en/help/ChooseComp.html
560sge/util/gui-installer/html/en/help/Empty.html 559sge/util/gui-installer/html/en/help/Empty.html
561sge/util/gui-installer/html/en/help/Error.html 560sge/util/gui-installer/html/en/help/Error.html
562sge/util/gui-installer/html/en/help/HostPanel.html 561sge/util/gui-installer/html/en/help/HostPanel.html
563sge/util/gui-installer/html/en/help/JMXConfig.html 562sge/util/gui-installer/html/en/help/JMXConfig.html
564sge/util/gui-installer/html/en/help/License.html 563sge/util/gui-installer/html/en/help/License.html
@@ -697,27 +696,26 @@ sge/util/resources/schemas/qstat/detaile @@ -697,27 +696,26 @@ sge/util/resources/schemas/qstat/detaile
697sge/util/resources/schemas/qstat/detailed_job_info_cb.xsd 696sge/util/resources/schemas/qstat/detailed_job_info_cb.xsd
698sge/util/resources/schemas/qstat/message.xsd 697sge/util/resources/schemas/qstat/message.xsd
699sge/util/resources/schemas/qstat/qstat.xsd 698sge/util/resources/schemas/qstat/qstat.xsd
700sge/util/resources/scripts/README.qsched 699sge/util/resources/scripts/README.qsched
701sge/util/resources/scripts/README.status 700sge/util/resources/scripts/README.status
702sge/util/resources/starter_methods/settaskid.sh 701sge/util/resources/starter_methods/settaskid.sh
703sge/util/resources/usersets/arusers 702sge/util/resources/usersets/arusers
704sge/util/resources/usersets/deadlineusers 703sge/util/resources/usersets/deadlineusers
705sge/util/resources/usersets/defaultdepartment 704sge/util/resources/usersets/defaultdepartment
706sge/util/resources/wrappers/qlogin_wrapper 705sge/util/resources/wrappers/qlogin_wrapper
707sge/util/resources/wrappers/rshd-wrapper 706sge/util/resources/wrappers/rshd-wrapper
708sge/util/rmiconsole.policy 707sge/util/rmiconsole.policy
709sge/util/setfileperm.sh 708sge/util/setfileperm.sh
710sge/util/setfileperm.sh.orig 
711sge/util/sgeCA/renew_all_certs.csh 709sge/util/sgeCA/renew_all_certs.csh
712sge/util/sgeCA/sge_ca 710sge/util/sgeCA/sge_ca
713sge/util/sgeCA/sge_ca.cnf 711sge/util/sgeCA/sge_ca.cnf
714sge/util/sgeCA/sge_ssl.cnf 712sge/util/sgeCA/sge_ssl.cnf
715sge/util/sgeCA/sge_ssl_template.cnf 713sge/util/sgeCA/sge_ssl_template.cnf
716sge/util/sgeSMF/bdb_template.xml 714sge/util/sgeSMF/bdb_template.xml
717sge/util/sgeSMF/execd_template.xml 715sge/util/sgeSMF/execd_template.xml
718sge/util/sgeSMF/qmaster_template.xml 716sge/util/sgeSMF/qmaster_template.xml
719sge/util/sgeSMF/sge_smf.sh 717sge/util/sgeSMF/sge_smf.sh
720sge/util/sgeSMF/sge_smf_support.sh 718sge/util/sgeSMF/sge_smf_support.sh
721sge/util/sgeSMF/shadowd_template.xml 719sge/util/sgeSMF/shadowd_template.xml
722sge/util/sge_aliases 720sge/util/sge_aliases
723sge/util/sge_request 721sge/util/sge_request
cvs diff -r1.14 -r1.15 pkgsrc/parallel/sge/distinfo (expand / switch to unified diff)

--- pkgsrc/parallel/sge/distinfo 2012/03/20 17:07:43 1.14
+++ pkgsrc/parallel/sge/distinfo 2012/04/15 04:07:21 1.15
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1$NetBSD: distinfo,v 1.14 2012/03/20 17:07:43 asau Exp $ 1$NetBSD: distinfo,v 1.15 2012/04/15 04:07:21 markd Exp $
2 2
3SHA1 (sge-8.0.0d.tar.gz) = e7500bbeec4075d054410f7465011efb61e93def 3SHA1 (sge-8.0.0d.tar.gz) = e7500bbeec4075d054410f7465011efb61e93def
4RMD160 (sge-8.0.0d.tar.gz) = aa83db459f4bbbebd7d2cc81290b7b8cb0818210 4RMD160 (sge-8.0.0d.tar.gz) = aa83db459f4bbbebd7d2cc81290b7b8cb0818210
5Size (sge-8.0.0d.tar.gz) = 12289130 bytes 5Size (sge-8.0.0d.tar.gz) = 12289130 bytes
6SHA1 (patch-ad) = 004600f060b5fcacd91ba68808686c0a679889f6 6SHA1 (patch-ad) = 004600f060b5fcacd91ba68808686c0a679889f6
7SHA1 (patch-ag) = 57eb4296e531f3a47b95c8842e0db0575870dcf0 7SHA1 (patch-ag) = 57eb4296e531f3a47b95c8842e0db0575870dcf0
8SHA1 (patch-am) = bbb87319c4dcb893be3757feec2c8cf69fe7ae61 8SHA1 (patch-am) = 1d367d541ec68d1c5618e3c594c5ce2db88a277e
9SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5 9SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5
10SHA1 (patch-bd) = aae1bdccfb81712c504b3add8b9728a2bcf3d1dd 10SHA1 (patch-bd) = aae1bdccfb81712c504b3add8b9728a2bcf3d1dd
11SHA1 (patch-bl) = f04f92c1a1c69443e9336f9fcbe7d988001f6681 11SHA1 (patch-bl) = f04f92c1a1c69443e9336f9fcbe7d988001f6681
12SHA1 (patch-bm) = 524268d07060fac00a2648e7c63377f965377c9d 12SHA1 (patch-bm) = 524268d07060fac00a2648e7c63377f965377c9d
13SHA1 (patch-daemons_common_procfs.c) = cdcbf58cb3278d5bc718fd235aaa76a10e938002 13SHA1 (patch-daemons_common_procfs.c) = cdcbf58cb3278d5bc718fd235aaa76a10e938002
14SHA1 (patch-source_3rdparty_qmon_Makefile) = c2847af5921aceadea4d669cac38b53478aee29c 14SHA1 (patch-source_3rdparty_sge_depend_def.h) = 92ad1ef5d0cf237fa083a262d38c67828593f679
15SHA1 (patch-source_clients_qmon_Makefile) = 19fb99bbd753c295296ca4bf986634b654d7b9f7 15SHA1 (patch-source-utilbin_Makefile) = b01de3925fd6795ee9bd0ad1c1bed7dfb2ed4d92
16SHA1 (patch-source_utilbin_Makefile) = 0377bae49e2e53fa0a7ce7486269c130a16a6c3d 
cvs diff -r1.7 -r1.8 pkgsrc/parallel/sge/patches/patch-am (expand / switch to unified diff)

--- pkgsrc/parallel/sge/patches/patch-am 2012/03/20 17:07:43 1.7
+++ pkgsrc/parallel/sge/patches/patch-am 2012/04/15 04:07:21 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-am,v 1.7 2012/03/20 17:07:43 asau Exp $ 1$NetBSD: patch-am,v 1.8 2012/04/15 04:07:21 markd Exp $
2 2
3Pkgsrc stuff 3Pkgsrc stuff
4GridEngine dev mailing list patch for "nbsd-1" issue 4GridEngine dev mailing list patch for "nbsd-1" issue
5ArchLinux static crypto also needs libz.a 5ArchLinux static crypto also needs libz.a
6 6
7--- source/aimk.orig 2011-11-28 23:06:13.000000000 +0000 7--- source/aimk.orig 2011-11-28 23:06:13.000000000 +0000
8+++ source/aimk 8+++ source/aimk
9@@ -961,7 +961,7 @@ if ( $SYSTEM_LIBS != 1 ) then 9@@ -961,7 +961,7 @@ if ( $SYSTEM_LIBS != 1 ) then
10 # we generate a berkeley db shared lib, so we need bdb include and lib path 10 # we generate a berkeley db shared lib, so we need bdb include and lib path
11 set CFLAGS = "-I$BERKELEYDB_HOME/include/${BDB_INCLUDE_SUBDIR} $CFLAGS" 11 set CFLAGS = "-I$BERKELEYDB_HOME/include/${BDB_INCLUDE_SUBDIR} $CFLAGS"
12 set LFLAGS = "-L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} $LFLAGS" 12 set LFLAGS = "-L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} $LFLAGS"
13- set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR}" 13- set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR}"
14+ set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} -R$BERKELEYDB_HOME/lib" 14+ set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} -R$BERKELEYDB_HOME/lib"
@@ -85,22 +85,21 @@ ArchLinux static crypto also needs libz. @@ -85,22 +85,21 @@ ArchLinux static crypto also needs libz.
85 set LIBS_DIR = ${SDIR} 85 set LIBS_DIR = ${SDIR}
86 endif 86 endif
87  87
88+ 88+
89+# we set SGE_ARCH_STRING down here because the sed command above 89+# we set SGE_ARCH_STRING down here because the sed command above
90+# would mess up the quotes around buildarch 90+# would mess up the quotes around buildarch
91+set ARCH_STRING = SGE_ARCH_STRING='\"'${buildarch}'\"' 91+set ARCH_STRING = SGE_ARCH_STRING='\"'${buildarch}'\"'
92+set CFLAGS = "-D$ARCH_STRING $CFLAGS" 92+set CFLAGS = "-D$ARCH_STRING $CFLAGS"
93+set DEPEND_FLAGS = "-D$ARCH_STRING $DEPEND_FLAGS" 93+set DEPEND_FLAGS = "-D$ARCH_STRING $DEPEND_FLAGS"
94+  94+
95 if ( $JNI == 1 ) then 95 if ( $JNI == 1 ) then
96  96
97 if ( "${JAVA_HOME}/${JAVA_INCL}" != /usr/include ) then 97 if ( "${JAVA_HOME}/${JAVA_INCL}" != /usr/include ) then
98@@ -2326,7 +2335,7 @@ if ( "$BUILDMAN" == 1 ) then 98@@ -2797,6 +2806,7 @@ if ( "$QMON" == 1 ) then
99 setenv PATH ${PATH}:${GROFFPATH} 99 else
100 endif  100 set FT_INC = ""
 101 endif
 102+ set FT_INC = "-I${LOCALBASE}/include/freetype2"
101  103
102- $SOURCE/scripts/mk_ascman $SOURCE $SGE_PRODUCT_MODE $BUILDMAN $BUILDHTMLMAN 104 cd $COMPILE_ARCH
103+ $SOURCE/scripts/mk_ascman $SOURCE $SGE_PRODUCT_MODE 0 $BUILDHTMLMAN 
104  105
105 if ( $status != 0 ) then 
106 echo not done 
File Added: pkgsrc/parallel/sge/patches/patch-source-utilbin_Makefile
$NetBSD: patch-source-utilbin_Makefile,v 1.1 2012/04/15 04:07:21 markd Exp $

Add LDFLAGS
replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper
doesnt reorder.

--- source/utilbin/Makefile.orig	2009-02-11 09:27:33.000000000 +0000
+++ source/utilbin/Makefile
@@ -118,14 +118,14 @@ gethostbyaddr.o:	$(UTILBIN_DIR)/gethostb
 
 #---------------------------------------------------------------------
 getservbyname:	getservbyname.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) 
-		$(CC) $(CFLAGS) -o $@ $(LFLAGS) getservbyname.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(DLLIB) $(LIBS)
+		$(CC) $(CFLAGS) -o $@ $(LFLAGS) getservbyname.o version.o -luti $(WINGRIDLIB) -lcommlists $(DLLIB) $(LIBS)
 
 getservbyname.o:	$(UTILBIN_DIR)/getservbyname.c
 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/getservbyname.c
 
 #---------------------------------------------------------------------
 filestat:	filestat.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
-		$(CC) $(CFLAGS) -o $@ $(LFLAGS) filestat.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
+		$(CC) $(CFLAGS) -o $@ $(LFLAGS) filestat.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
 
 filestat.o:	$(UTILBIN_DIR)/filestat.c
 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/filestat.c
@@ -146,28 +146,28 @@ read_raw.o:		$(UTILBIN_DIR)/read_raw.c
 
 #---------------------------------------------------------------------
 echo_raw:		echo_raw.o version.o $(UTILIB) $(COMMLISTSLIB) 
-		$(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti $(COMMLISTSLIB) $(LIBS)
+		$(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lcommlists $(LIBS)
 
 echo_raw.o:		$(UTILBIN_DIR)/echo_raw.c
 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/echo_raw.c
 
 #---------------------------------------------------------------------
 checkprog:	checkprog.o peopen_standalone.o pids_standalone.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) 
-		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkprog.o peopen_standalone.o pids_standalone.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS) $(DLLIB)
+		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkprog.o peopen_standalone.o pids_standalone.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS) $(DLLIB)
 
 checkprog.o:	$(UTILBIN_DIR)/checkprog.c
 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/checkprog.c
 
 #---------------------------------------------------------------------
 checkuser:     checkuser.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
-		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkuser.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
+		$(CC) $(CFLAGS) -o $@ $(LFLAGS) checkuser.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
 
 checkuser.o:      $(UTILBIN_DIR)/checkuser.c
 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/checkuser.c
 
 #---------------------------------------------------------------------
 adminrun:   adminrun.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) 
-		$(CC) -o $@ $(LFLAGS) adminrun.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
+		$(CC) -o $@ $(LFLAGS) adminrun.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
 
 adminrun.o: $(UTILBIN_DIR)/adminrun.c
 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/adminrun.c
@@ -188,7 +188,7 @@ signals.o:	$(UTILBIN_DIR)/signals.c
 
 #---------------------------------------------------------------------
 loadcheck: loadcheck.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB)
-	$(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LOADAVGLIBS) $(LIBS)
+	$(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) -lcommlists $(LOADAVGLIBS) $(LIBS)
 
 loadcheck.o: $(UTILBIN_DIR)/loadcheck.c
 	$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/loadcheck.c
@@ -203,26 +203,26 @@ loadcheck.obj: $(UTILBIN_DIR)/loadcheck.
 
 #---------------------------------------------------------------------
 languagetest:   languagetest.o version.o  $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) 
-		$(CC) -o $@ $(LFLAGS) languagetest.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
+		$(CC) -o $@ $(LFLAGS) languagetest.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
 
 languagetest.o: $(UTILBIN_DIR)/languagetest.c
 		$(CC) $(CFLAGS) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/languagetest.c
 #---------------------------------------------------------------------
 infotext:   infotext.o  version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) 
-		$(CC) -o $@ $(LFLAGS) infotext.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
+		$(CC) -o $@ $(LFLAGS) infotext.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
 
 infotext.o: $(UTILBIN_DIR)/infotext.c
 		$(CC) $(CFLAGS) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/infotext.c
 
 #---------------------------------------------------------------------
 fstype:   fstype.o  version.o $(WINGRIDLIB_DEP) $(COMMLISTSLIB) $(UTILIB) 
-		$(CC) -o $@ $(LFLAGS) fstype.o version.o $(WINGRIDLIB) $(FSTYPELIBS) -luti $(COMMLISTSLIB) $(LIBS)  
+		$(CC) -o $@ $(LFLAGS) fstype.o version.o $(WINGRIDLIB) $(FSTYPELIBS) -luti -lcommlists $(LIBS)  
 
 fstype.o: $(UTILBIN_DIR)/fstype.c
 		$(CC) $(CFLAGS) $(MEMCFLAG) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/fstype.c
 #---------------------------------------------------------------------
 spooldefaults:   spooldefaults.o  version.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLCLIB) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(WINGRIDLIB_DEP) $(UTILIB) 
-		$(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS)
+		$(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o $(LDFLAGS) -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS)
 
 spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c
 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.c
@@ -236,7 +236,7 @@ spoolinit.o: $(UTILBIN_DIR)/spoolinit.c
 
 #---------------------------------------------------------------------
 testsuidroot:   testsuidroot.o version.o $(WINGRIDLIB_DEP)  $(UTILIB) $(COMMLISTSLIB)
-		$(CC) -o $@ $(LFLAGS) testsuidroot.o version.o -luti $(COMMLISTSLIB) $(WINGRIDLIB) $(LIBS)
+		$(CC) -o $@ $(LFLAGS) testsuidroot.o version.o -luti -lcommlists $(WINGRIDLIB) $(LIBS)
 
 testsuidroot.o: $(UTILBIN_DIR)/testsuidroot.c
 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/testsuidroot.c
@@ -257,7 +257,7 @@ tst_pthread_signals.o: $(UTILBIN_DIR)/ts
 
 #---------------------------------------------------------------------
 spooledit: spooledit.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(WINGRIDLIB_DEP) $(UTILIB)  
-		$(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
+		$(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o $(LDFLAGS) -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
 
 spooledit.o: $(UTILBIN_DIR)/spooledit.c
 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooledit.c
@@ -290,7 +290,7 @@ valid_jvmlib.o:		$(UTILBIN_DIR)/valid_jv
 		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/valid_jvmlib.c
 
 #---------------------------------------------------------------------
-AUTHUSER_ADD_LIBS = -luti $(COMMLISTSLIB) $(DLLIB)
+AUTHUSER_ADD_LIBS = -luti -lcommlists $(DLLIB)
 
 authuser: authuser.o juti.o $(UTILIB) $(COMMLISTSLIB)
 	$(CC) -o authuser $(LFLAGS) authuser.o juti.o $(AUTHLIBS) $(AUTHUSER_ADD_LIBS) $(LIBS)
File Added: pkgsrc/parallel/sge/patches/patch-source_3rdparty_sge_depend_def.h
$NetBSD: patch-source_3rdparty_sge_depend_def.h,v 1.1 2012/04/15 04:07:21 markd Exp $

ensure varargs prototypes to fix build on 64bit

--- source/3rdparty/sge_depend/def.h.orig	2012-04-10 04:36:21.000000000 +0000
+++ source/3rdparty/sge_depend/def.h
@@ -170,6 +170,8 @@ int cppsetup();
 struct symtab **isdefined();
 #endif
 
+#define NeedVarargsPrototypes 1
+
 #if NeedVarargsPrototypes
 extern void fatalerr(char *, ...);
 extern void warning(char *, ...);