[pkgsrc/trunk]: pkgsrc/lang/siod Add destdir support and mark not make jobs s...

[ahoka <ahoka%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8db0bf28a3e7
branches:  trunk
changeset: 546341:8db0bf28a3e7
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Thu Aug 28 13:15:27 2008 +0000

description:
Add destdir support and mark not make jobs safe.

Submitted by Aleksej Saushev in PR pkg/39406.

diffstat:

 lang/siod/Makefile         |   5 ++-
 lang/siod/distinfo         |   4 +-
 lang/siod/patches/patch-aa |  67 +++++++++++++++++++++++++++++++++++++--------
 3 files changed, 61 insertions(+), 15 deletions(-)

diffs (133 lines):

diff -r abe0f6bbf244 -r 8db0bf28a3e7 lang/siod/Makefile
--- a/lang/siod/Makefile        Thu Aug 28 07:39:49 2008 +0000
+++ b/lang/siod/Makefile        Thu Aug 28 13:15:27 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/09/09 02:43:09 obache Exp $
+# $NetBSD: Makefile,v 1.18 2008/08/28 13:15:27 ahoka Exp $
 
 DISTNAME=              siod
 PKGNAME=               siod-3.0
@@ -11,8 +11,11 @@
 HOMEPAGE=              http://people.delphi.com/gjc/siod.html
 COMMENT=               Small-footprint implementation of the Scheme programming language
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 MAKE_FILE=             makefile
+MAKE_JOBS_SAFE=                no
 BUILD_TARGET=          ${OPSYS}
 MAKE_ENV+=             CC=${CC:Q}
 CPPFLAGS+=             -Dunix=1
diff -r abe0f6bbf244 -r 8db0bf28a3e7 lang/siod/distinfo
--- a/lang/siod/distinfo        Thu Aug 28 07:39:49 2008 +0000
+++ b/lang/siod/distinfo        Thu Aug 28 13:15:27 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2006/01/11 21:54:06 joerg Exp $
+$NetBSD: distinfo,v 1.7 2008/08/28 13:15:27 ahoka Exp $
 
 SHA1 (siod.tgz) = e49cbd59bbdf3af607335a300ace98c561ad5bdd
 RMD160 (siod.tgz) = 51aeb394d1391d289abd6375502b23cb9089ff31
 Size (siod.tgz) = 214700 bytes
-SHA1 (patch-aa) = ed4f93457a55f9ca74bad5b8c8e2c62fda487cb7
+SHA1 (patch-aa) = 77f4d38b486d682072a93180c5a5fd7f42df172d
 SHA1 (patch-ab) = 840474628c3863261ea91f0c7fe730765ab72e4e
 SHA1 (patch-ac) = 4466fd94141f87b4d9a6dd8ea3a0f29bdd09998b
 SHA1 (patch-ad) = 3a09aba5ada19edb0307e69412dc18e90d60afbe
diff -r abe0f6bbf244 -r 8db0bf28a3e7 lang/siod/patches/patch-aa
--- a/lang/siod/patches/patch-aa        Thu Aug 28 07:39:49 2008 +0000
+++ b/lang/siod/patches/patch-aa        Thu Aug 28 13:15:27 2008 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2006/01/11 21:54:06 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2008/08/28 13:15:27 ahoka Exp $
 
 NetBSD definition for makefile, and make solaris into SunOS so
 that we can use ${OPSYS}.
 
---- makefile   1999/08/06 09:16:57     1.1
-+++ makefile   1999/08/06 09:20:34
+--- makefile.orig      1998-02-20 15:52:04.000000000 +0300
++++ makefile   2008-08-26 01:43:42.000000000 +0400
 @@ -19,10 +19,10 @@
  #
  # 
@@ -20,7 +20,7 @@
  LIBSIODDIR=$(LIBDIR)/siod
  CP_F=cp -f
  # -Wmissing-prototypes
-@@ -137,16 +137,27 @@
+@@ -137,10 +137,9 @@
  #       from /usr/lib/libSYBxxx.so -> /sybase/lib/libxxx.so
  #       for each shared library in /sybase/lib.
  
@@ -32,12 +32,10 @@
        LD=ld \
        CFLAGS="$(GCCW) $(CDEBUG) -DSUN5 -O2 $(SLD)" \
        LD_EXE_FLAGS="-R $(LIBDIR) -R $(LIBSIODDIR)" \
-       LD_EXE_LIBS="-lm -lsocket -lnsl -lposix4 -dl" \
-       LD_LIB_FLAGS="-G" \
-       LD_LIB_LIBS="$(LD_EXE_LIBS)" \
-+      SO="so" \
-+        build_driver
-+
+@@ -150,6 +149,18 @@
+       SO="so" \
+         build_driver
+ 
 +NetBSD DragonFly:
 +      $(MAKE) $(LDLP) \
 +      PROGS="siod ndbm.so tar.so parser_pratt.so ss.so regex.so" \
@@ -47,6 +45,51 @@
 +      LD_EXE_LIBS="-lm" \
 +      LD_LIB_FLAGS="-G" \
 +      LD_LIB_LIBS="$(LD_EXE_LIBS) -lm -lcrypt" \
-       SO="so" \
-         build_driver
++      SO="so" \
++        build_driver
++
+ sybsolaris:
+       $(MAKE) $(LDLP) \
+       PROGS="siod ndbm.so tar.so parser_pratt.so ss.so regex.so\
+@@ -419,30 +430,30 @@
+ install: $(DISTFILES)
+       @echo "Note: This does not do a build. Only installs what already"
+       @echo "      sits in the directory."
+-      -mkdir -p $(MANDIR)
+-      -mkdir -p $(BINDIR)
+-      -mkdir -p $(LIBDIR)
+-      -mkdir -p $(INCDIR)
+-      -mkdir -p $(LIBSIODDIR)
++      -mkdir -p $(DESTDIR)$(MANDIR)
++      -mkdir -p $(DESTDIR)$(BINDIR)
++      -mkdir -p $(DESTDIR)$(LIBDIR)
++      -mkdir -p $(DESTDIR)$(INCDIR)
++      -mkdir -p $(DESTDIR)$(LIBSIODDIR)
+       -for X in $(INTO_BINDIR)  ; do \
+-       $(CP_F) $$X $(BINDIR) ;\
++       $(CP_F) $$X $(DESTDIR)$(BINDIR) ;\
+       done
+       -for X in $(LIBFILES) ; do \
+-       $(CP_F) $$X $(LIBSIODDIR) ;\
++       $(CP_F) $$X $(DESTDIR)$(LIBSIODDIR) ;\
+       done
+       -for X in $(SOLIBFILES) ; do \
+         for E in so sl ; do \
+-         $(CP_F) $$X.$$E $(LIBSIODDIR) ;\
++         $(CP_F) $$X.$$E $(DESTDIR)$(LIBSIODDIR) ;\
+         done ;\
+       done
+       -for X in $(INTO_LIBDIR) ; do \
+-       $(CP_F) $$X $(LIBDIR) ;\
++       $(CP_F) $$X $(DESTDIR)$(LIBDIR) ;\
+       done
+       -for X in $(MANPAGES) ; do \
+-       $(CP_F) $$X.man $(MANDIR)/$$X.$(MANSEC) ;\
++       $(CP_F) $$X.man $(DESTDIR)$(MANDIR)/$$X.$(MANSEC) ;\
+       done
+       -for X in $(PUBINCS) ; do \
+-       $(CP_F) $$X $(INCDIR) ;\
++       $(CP_F) $$X $(DESTDIR)$(INCDIR) ;\
+       done
+       @echo "Install done."