-export-dynamic is a linker option, mark it accordingly. Fix non-catman

build as root. Fix rpath path of spooledit.

4 files changed, 54 insertions, 11 deletions

diff --git a/parallel/gridscheduler/distinfo b/parallel/gridscheduler/distinfo
index e897de59378..068b58137dc 100644
--- a/parallel/gridscheduler/distinfo
+++ b/parallel/gridscheduler/distinfo
@@ -1,14 +1,14 @@
-$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-am) = d9425eda7027a43921aa43c7a2428bc1236b4bd8
+SHA1 (patch-ak) = d96eb75285ca793d96ae33a86c25b6f0e8f2d1b7
+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
diff --git a/parallel/gridscheduler/patches/patch-ak b/parallel/gridscheduler/patches/patch-ak
index c027618f945..b3a76af883e 100644
--- a/parallel/gridscheduler/patches/patch-ak
+++ b/parallel/gridscheduler/patches/patch-ak
@@ -1,10 +1,10 @@
-$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
  
@@ -33,6 +33,15 @@ doesnt reorder.
  
  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
  
diff --git a/parallel/gridscheduler/patches/patch-am b/parallel/gridscheduler/patches/patch-am
index fb7b0060e06..8383de351b7 100644
--- a/parallel/gridscheduler/patches/patch-am
+++ b/parallel/gridscheduler/patches/patch-am
@@ -1,4 +1,4 @@
-$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
@@ -11,7 +11,21 @@ $NetBSD: patch-am,v 1.2 2015/12/13 00:50:39 asau Exp $
  
  # 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"
@@ -20,11 +34,12 @@ $NetBSD: patch-am,v 1.2 2015/12/13 00:50:39 asau Exp $
     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   = ""
diff --git a/parallel/gridscheduler/patches/patch-bd b/parallel/gridscheduler/patches/patch-bd
index b7eed37edfa..1d6b2ea0f7b 100644
--- a/parallel/gridscheduler/patches/patch-bd
+++ b/parallel/gridscheduler/patches/patch-bd
@@ -1,4 +1,4 @@
-$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
@@ -72,3 +72,22 @@ $NetBSD: patch-bd,v 1.2 2015/12/13 00:50:39 asau Exp $
        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