 @@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.5 2015/12/13 00:50:39 asau Exp $
+$NetBSD: distinfo,v 1.6 2015/12/25 20:12:16 joerg Exp $
 SHA1 (GE2011.11p1.tar.gz) = 8935cc015e9de87d000b7e1814a1359b3cd6f3ca
 RMD160 (GE2011.11p1.tar.gz) = 535f453ace86bfa067cebad2b2b37d7e730aa779
 Size (GE2011.11p1.tar.gz) = 14305562 bytes
 SHA1 (patch-ad) = 0da714b6f9f2dfb0d952f84863a76fdac23aed8e
 SHA1 (patch-ag) = f33c490bbb93c6d37ef1937210bff7b92cf19207
-SHA1 (patch-ak) = e73a58e547b8401eff27a4635629577767234f0f
+SHA1 (patch-ak) = d96eb75285ca793d96ae33a86c25b6f0e8f2d1b7
-SHA1 (patch-am) = d9425eda7027a43921aa43c7a2428bc1236b4bd8
+SHA1 (patch-am) = 954f3bc8093c52910c0cae66423d4d4042d04043
 SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5
-SHA1 (patch-bd) = eaa18b6234b8fe3f0046766df56afab938d0f7ee
+SHA1 (patch-bd) = 47e1a4f61916ec7038ed5ce9b8beedb0527c04e9
 SHA1 (patch-bl) = d13fd8f276093304fcd34769714cbcce95012809
 SHA1 (patch-bm) = a760a1f06ab301acb1f0dcb88151c308f381ab60
 SHA1 (patch-daemons_common_procfs.c) = cdcbf58cb3278d5bc718fd235aaa76a10e938002
 SHA1 (patch-source_libs_uti_sge__loadmem.c) = fa4a36931ef90f6d18f35bc1a081d0f7d2a0728a

 @@ -1,20 +1,20 @@
-$NetBSD: patch-ak,v 1.1.1.1 2012/03/21 20:48:53 asau Exp $
+$NetBSD: patch-ak,v 1.2 2015/12/25 20:12:16 joerg Exp $
 Add LDFLAGS
 replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper
 doesnt reorder.
---- source/utilbin/Makefile.orig	2011-11-14 19:00:55.000000000 +0000
+--- source/utilbin/Makefile.orig	2012-05-23 19:04:49.000000000 +0000
 +++ source/utilbin/Makefile
 @@ -146,7 +146,7 @@ read_raw.o:		$(UTILBIN_DIR)/read_raw.c
  #---------------------------------------------------------------------
  echo_raw:		echo_raw.o version.o $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
 -		$(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lrmon -llck $(COMMLISTSLIB) $(LIBS)
 +		$(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lrmon -llck -lcommlists $(LIBS)
  echo_raw.o:		$(UTILBIN_DIR)/echo_raw.c
  		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/echo_raw.c
 @@ -188,7 +188,7 @@ signals.o:	$(UTILBIN_DIR)/signals.c
  #---------------------------------------------------------------------
 @@ -23,22 +23,31 @@ doesnt reorder.
 +	$(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LOADAVGLIBS) $(LIBS)
  loadcheck.o: $(UTILBIN_DIR)/loadcheck.c
  	$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/loadcheck.c
 @@ -222,7 +222,7 @@ 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) $(LCKLIB) $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB)
 -		$(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) -llck -lrmon $(DLLIB) $(SLIBS) $(LIBS)
 +		$(CC) -o $@ $(LFLAGS) $(COMPILER_RPATH_FLAG)$(SGE_ROOT)/lib/$(SGE_ARCH) spooldefaults.o version.o sge_mt_init.o -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon $(DLLIB) $(SLIBS) $(LIBS)
  spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c
  		$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.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) $(LCKLIB) $(RMONLIB)
 -		$(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) -llck -lrmon -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
 +		$(CC) -o $@ $(LFLAGS) ${COMPILER_RPATH_FLAG}${SGE_ROOT}/lib/${SGE_ARCH} spooledit.o version.o sge_mt_init.o -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon -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 -llck -lrmon $(COMMLISTSLIB) $(DLLIB)
 +AUTHUSER_ADD_LIBS = -luti -llck -lrmon -lcommlists $(DLLIB)
  authuser: authuser.o juti.o $(UTILIB) $(LCKLIB) $(RMONLIB) $(COMMLISTSLIB)
  	$(CC) -o authuser $(LFLAGS) authuser.o juti.o $(AUTHLIBS) $(AUTHUSER_ADD_LIBS) $(LIBS)

 @@ -1,40 +1,55 @@
-$NetBSD: patch-am,v 1.2 2015/12/13 00:50:39 asau Exp $
+$NetBSD: patch-am,v 1.3 2015/12/25 20:12:16 joerg Exp $
 --- source/aimk.orig	2012-05-23 19:05:00.000000000 +0000
 +++ source/aimk
 @@ -422,7 +422,7 @@ set SPOOLING_DEPS   = "spoolloaderlib sp
  # we generate a berkeley db shared lib, so we need bdb include and lib path
  set CFLAGS            = "-I$BERKELEYDB_HOME/include/${BDB_INCLUDE_SUBDIR} $CFLAGS"
  set LFLAGS            = "-L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} $LFLAGS"
 -set SHARED_LFLAGS    = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR}"
 +set SHARED_LFLAGS    = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} -R$BERKELEYDB_HOME/lib"
  # JUTI Targets
  set JUTI_ALL  = juti_all
-@@ -1334,10 +1334,10 @@ case NETBSD_*:
+@@ -1301,11 +1301,11 @@ case FREEBSD_*:
     set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set NOERR_CFLAG = "-Wno-error"
 -   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
 +   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -Wl,-export-dynamic"
     set LIBS     = "$LIBS -lkvm"
     set SHAREDLD = $CC
     set SHARED_CFLAGS = "-fPIC"
 -   set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic"
 +   set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
     set AUTHLIBS = "-lcrypt -lpam"
     set XMTDEF   = ""
@@ -1334,20 +1334,20 @@ case NETBSD_*:
     set CXX      = g++
     set DLLIB    = ""
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
 -   set CFLAGS   = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
 +   set CFLAGS   = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include"
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set NOERR_CFLAG = "-Wno-error"
 -   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
-+   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
++   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -Wl,-export-dynamic -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
     set LIBS     = "$LIBS -lkvm"
     set SHAREDLD = $CC
     set SHARED_CFLAGS = "-fPIC"
-@@ -1345,9 +1345,9 @@ case NETBSD_*:
+-   set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic"
 +   set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
     set AUTHLIBS = "-lcrypt -lpam"
     set XMTDEF   = ""
 -   set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include -I/usr/pkg/include"
 +   set XINCD    = "$XMTINCD $XINCD -I${X11BASE}/include"
     set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD $XCFLAGS"
 -   set XLIBD    = "-L/usr/X11R6/lib -R/usr/X11R6/lib -L/usr/pkg/lib -R /usr/pkg/lib"
 +   set XLIBD    = "-L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R ${LOCALBASE}/lib"
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set XMLIBS   = "$XLIBS"
 @@ -2519,7 +2519,7 @@ if ( "$BUILDMAN" == 1 ) then
        exit 1

 @@ -1,14 +1,14 @@
-$NetBSD: patch-bd,v 1.2 2015/12/13 00:50:39 asau Exp $
+$NetBSD: patch-bd,v 1.3 2015/12/25 20:12:16 joerg Exp $
 --- source/scripts/distinst.orig	2012-05-23 19:04:39.000000000 +0000
 +++ source/scripts/distinst
 @@ -75,13 +75,13 @@ DRMAA_SHARED_LIBRARIES="libdrmaa"
  # The last number listed here will be the verson linked from libdrmaa.so
  DRMAA_SHARED_LIB_VERSIONS="1.0"
  DRMAA_HEADER_FILES="libs/japi/drmaa.h"
 -DRMAAJ_FILES="CLASSES/jdrmaa/drmaa"
 +#DRMAAJ_FILES="CLASSES/jdrmaa/drmaa"
  JNI_SHARED_LIBRARIES="libdrmaa libjuti libjgdi"
 -JUTIJ_FILES="CLASSES/juti/juti"
 @@ -62,13 +62,32 @@ $NetBSD: patch-bd,v 1.2 2015/12/13 00:50
        Execute chmod 755 $DEST_SGE_ROOT/util/resources/jsv/jsv.sh \
                          $DEST_SGE_ROOT/util/resources/jsv/jjsv.sh \
                          $DEST_SGE_ROOT/util/resources/jsv/jsv.pl \
 @@ -1089,9 +1092,6 @@ if [ $instcommon = true ]; then
        if [ -f CLASSES/herd/herd.jar ]; then
           Execute cp CLASSES/herd/herd.jar $DEST_SGE_ROOT/lib/herd.jar
 -      elif [ $exit_on_error = true ]; then
 -         echo "\"CLASSES/herd/herd.jar\" not found. Installation failed."
 -         exit 1
        fi
     fi
@@ -1121,11 +1121,14 @@ if [ $instcommon = true ]; then
        Execute find $DEST_SGE_ROOT/man -type d | xargs chmod 755
        Execute find $DEST_SGE_ROOT/man -type f | xargs chmod 644
+-
 -      Execute find $DEST_SGE_ROOT/catman -type d | xargs chmod 755
 -      Execute find $DEST_SGE_ROOT/catman -type f | xargs chmod 644
 -      Cleanup man catman
 +      Cleanup man
++
 +      if [ -d MANSBUILD_$MANSRCDIR/ASCMAN/catman ]; then
 +         Execute find $DEST_SGE_ROOT/catman -type d | xargs chmod 755
 +         Execute find $DEST_SGE_ROOT/catman -type f | xargs chmod 644
 +        Cleanup catman
 +      fi
     fi
     if [ $instdoc = true ]; then