[pkgsrc/trunk]: pkgsrc/parallel/dqs Use config.* from pkgrsc.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/parallel/dqs Use config.* from pkgrsc.
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:33:35 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b5deef9d323
branches:  trunk
changeset: 513833:5b5deef9d323
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jun 04 12:57:11 2006 +0000

description:
Use config.* from pkgrsc.
Add DragonFly support.
Fix errno usage.
Force traditional cpp for Makefile generation.

diffstat:

 parallel/dqs/Makefile         |   6 +++++-
 parallel/dqs/distinfo         |  12 +++++++-----
 parallel/dqs/patches/patch-ab |  13 +++++++------
 parallel/dqs/patches/patch-ad |   4 ++--
 parallel/dqs/patches/patch-ae |   4 ++--
 parallel/dqs/patches/patch-af |   8 ++++----
 parallel/dqs/patches/patch-ag |  13 +++++++++++++
 parallel/dqs/patches/patch-ah |  13 +++++++++++++
 8 files changed, 53 insertions(+), 20 deletions(-)

diffs (172 lines):

diff -r 9abedbd563fc -r 5b5deef9d323 parallel/dqs/Makefile
--- a/parallel/dqs/Makefile     Sun Jun 04 12:34:08 2006 +0000
+++ b/parallel/dqs/Makefile     Sun Jun 04 12:57:11 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:26 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 12:57:11 joerg Exp $
 #
 
 DISTNAME=      DQS-3.3.2
@@ -28,6 +28,10 @@
 post-patch:
        ${ECHO} '#undef DEFAULT_HOST' >> ${WRKSRC}/SRC/dqs.h
 
+pre-configure:
+       ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/UTIL/config.guess
+       ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/UTIL/config.sub
+
 post-install:
        ${INSTALL_DATA_DIR} ${DOCDIR}
 .for doc in ${DOCS}
diff -r 9abedbd563fc -r 5b5deef9d323 parallel/dqs/distinfo
--- a/parallel/dqs/distinfo     Sun Jun 04 12:34:08 2006 +0000
+++ b/parallel/dqs/distinfo     Sun Jun 04 12:57:11 2006 +0000
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.6 2005/07/08 19:46:59 kristerw Exp $
+$NetBSD: distinfo,v 1.7 2006/06/04 12:57:11 joerg 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-ab) = c3b1c4561f450b5c0628eb4d84f40c7850c1fb84
+SHA1 (patch-ab) = 8cb54cb86c7558da60ff6fb329ca71a671a0dded
 SHA1 (patch-ac) = c72be633789525f73bb0e1415ff7b300b7576e7e
-SHA1 (patch-ad) = dcc151f4648da1beabe9191e77e25c8792a65391
-SHA1 (patch-ae) = d048393c1a6c98e66049aeca67ffda49d6e40593
-SHA1 (patch-af) = ede6336939be8f2c8dd7d5a13f96f6e5b40b5a41
+SHA1 (patch-ad) = 6a7116cf60b9d4305257b233f2bc3dbeeddfc069
+SHA1 (patch-ae) = f1d1a8a370a65fcbd3144224387423bb46ed6054
+SHA1 (patch-af) = 41081707b3b4cbb2a5cd78adcd983f029362389e
+SHA1 (patch-ag) = 76a7c43036a5be2952a1822e0871bc3dabb8806c
+SHA1 (patch-ah) = 8d1a43c595981e0f148f44a3f5edb5368f18b5cb
diff -r 9abedbd563fc -r 5b5deef9d323 parallel/dqs/patches/patch-ab
--- a/parallel/dqs/patches/patch-ab     Sun Jun 04 12:34:08 2006 +0000
+++ b/parallel/dqs/patches/patch-ab     Sun Jun 04 12:57:11 2006 +0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/06/26 20:23:42 agc Exp $
+$NetBSD: patch-ab,v 1.2 2006/06/04 12:57:11 joerg Exp $
 
---- SRC/globals.h      2000/12/12 07:24:12     1.8
-+++ SRC/globals.h      2002/09/18 11:13:49
-@@ -246,7 +246,7 @@
+--- SRC/globals.h.orig 2000-12-12 07:24:12.000000000 +0000
++++ SRC/globals.h
+@@ -245,8 +245,7 @@ static char globals_rcsid[]="$Id: global
+  *
   *--------------------------------------------------*/
  
- extern int errno;
+-extern int errno;
 -#if !(defined(__linux__) && defined (__GLIBC__) && __GLIBC__ >=2) && !(defined(__FreeBSD__) & defined(__GNUC__) && __GNUC__ >=2)
-+#if !(defined(__linux__) && defined (__GLIBC__) && __GLIBC__ >=2) && !(defined(__FreeBSD__) & defined(__GNUC__) && __GNUC__ >=2) && !defined(__NetBSD__)
++#if !(defined(__linux__) && defined (__GLIBC__) && __GLIBC__ >=2) && !(defined(__FreeBSD__) & defined(__GNUC__) && __GNUC__ >=2) && !defined(__NetBSD__) && !defined(__DragonFly__)
  extern char *sys_errlist[];
  #endif
  #ifdef MAINPROGRAM
diff -r 9abedbd563fc -r 5b5deef9d323 parallel/dqs/patches/patch-ad
--- a/parallel/dqs/patches/patch-ad     Sun Jun 04 12:34:08 2006 +0000
+++ b/parallel/dqs/patches/patch-ad     Sun Jun 04 12:57:11 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2003/07/26 00:41:11 kristerw Exp $
+$NetBSD: patch-ad,v 1.2 2006/06/04 12:57:11 joerg Exp $
 --- SRC/h.h.orig       Fri Jul 25 23:21:58 2003
 +++ SRC/h.h    Fri Jul 25 23:24:06 2003
 @@ -195,7 +195,7 @@
@@ -6,7 +6,7 @@
  #include <nlist.h>
  #endif
 -#if ( defined(i386) || defined(__MACH__) ||  defined(sun) || defined(solaris) || defined (SOLARIS23) || defined (SOLARIS24) || defined (SOLARIS25) || defined(NeXT) )
-+#if ( defined(i386) || defined(__MACH__) ||  defined(sun) || defined(solaris) || defined (SOLARIS23) || defined (SOLARIS24) || defined (SOLARIS25) || defined(NeXT) || defined(__NetBSD__))
++#if ( defined(i386) || defined(__MACH__) ||  defined(sun) || defined(solaris) || defined (SOLARIS23) || defined (SOLARIS24) || defined (SOLARIS25) || defined(NeXT) || defined(__NetBSD__) || 
defined(__DragonFly__))
  /*   empty */
  #else
  #include <sys/sysinfo.h>
diff -r 9abedbd563fc -r 5b5deef9d323 parallel/dqs/patches/patch-ae
--- a/parallel/dqs/patches/patch-ae     Sun Jun 04 12:34:08 2006 +0000
+++ b/parallel/dqs/patches/patch-ae     Sun Jun 04 12:57:11 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2003/07/26 00:41:11 kristerw Exp $
+$NetBSD: patch-ae,v 1.2 2006/06/04 12:57:11 joerg Exp $
 --- SRC/def.h.orig     Fri Jul 25 23:22:18 2003
 +++ SRC/def.h  Fri Jul 25 23:26:14 2003
 @@ -753,7 +753,7 @@
@@ -6,7 +6,7 @@
  /* GETPGRP - get a process group */
  
 -#if (defined(__sgi) || defined(__convex__) || defined(_AIX) || defined(i386) || defined (SVR3) || defined (__osf__) || defined(solaris)|| defined(SOLARIS23_UP) )
-+#if (defined(__sgi) || defined(__convex__) || defined(_AIX) || defined(i386) || defined (SVR3) || defined (__osf__) || defined(solaris)|| defined(SOLARIS23_UP)  || defined(__NetBSD__))
++#if (defined(__sgi) || defined(__convex__) || defined(_AIX) || defined(i386) || defined (SVR3) || defined (__osf__) || defined(solaris)|| defined(SOLARIS23_UP)  || defined(__NetBSD__) || 
defined(__DragonFly__))
  #define GETPGRP getpgrp()
  #else
  #define GETPGRP getpgrp(getpid())
diff -r 9abedbd563fc -r 5b5deef9d323 parallel/dqs/patches/patch-af
--- a/parallel/dqs/patches/patch-af     Sun Jun 04 12:34:08 2006 +0000
+++ b/parallel/dqs/patches/patch-af     Sun Jun 04 12:57:11 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2004/09/10 20:23:46 wiz Exp $
+$NetBSD: patch-af,v 1.3 2006/06/04 12:57:11 joerg Exp $
 
 --- SRC/Makefile.orig  1999-07-02 17:06:53.000000000 +0200
 +++ SRC/Makefile
@@ -7,7 +7,7 @@
                cp $(PROTO) Makefile.c
                echo "#define `../UTIL/config.guess 1`" | sed s/\\./_/g | sed s/-/_/g > Makefile.h
 -              $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
-+              $(CC) -E Makefile.c | sed 's/        /  /g' | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
++              $(CC) -traditional -E Makefile.c | sed 's/        /     /g' | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
  #             rm -f Makefile.c
                @$(MAKE) -f Makefile.typ $@
  
@@ -16,7 +16,7 @@
                cp $(PROTO) Makefile.c
                echo "#define `../UTIL/config.guess 1`" | sed s/\\./_/g | sed s/-/_/g > Makefile.h
 -              $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
-+              $(CC) -E Makefile.c | sed 's/        /  /g' | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
++              $(CC) -traditional -E Makefile.c | sed 's/        /     /g' | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
                @$(MAKE) -f Makefile.typ $@
  
  .DEFAULT      : 
@@ -24,7 +24,7 @@
                cp $(PROTO) Makefile.c
                echo "#define `../UTIL/config.guess`" | sed s/\\./_/g | sed s/-/_/g > Makefile.h
 -              $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
-+              $(CC) -E Makefile.c | sed 's/        /  /g' | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
++              $(CC) -traditional -E Makefile.c | sed 's/        /     /g' | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
  #             rm -f Makefile.c
                @$(MAKE) -f Makefile.typ $@
  
diff -r 9abedbd563fc -r 5b5deef9d323 parallel/dqs/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/dqs/patches/patch-ag     Sun Jun 04 12:57:11 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2006/06/04 12:57:11 joerg Exp $
+
+--- SRC/dqs_mail.c.orig        2006-06-04 12:40:25.000000000 +0000
++++ SRC/dqs_mail.c
+@@ -74,7 +74,7 @@ static char dqs_mail_rcsid[]="$Id: dqs_m
+ #include "struct.h"
+ #include "func.h"
+ #include "globals.h"
+-#include <sys/errno.h>
++#include <errno.h>
+ #include "dqs_errno.h"
+ 
+ /************************************************************/
diff -r 9abedbd563fc -r 5b5deef9d323 parallel/dqs/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/dqs/patches/patch-ah     Sun Jun 04 12:57:11 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/06/04 12:57:11 joerg Exp $
+
+--- tools/actf.c.orig  2006-06-04 12:40:42.000000000 +0000
++++ tools/actf.c
+@@ -1,7 +1,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ 
+ FILE  *f;
+ FILE *of;
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail Add fix for security issue 2006-06-01 from Squirr...
Next by Date: [pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Add environment settings for the tools t...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail Add fix for security issue 2006-06-01 from Squirr...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Add environment settings for the tools t...
Indexes:
Home | Main Index | Thread Index | Old Index