[pkgsrc/pkgsrc-2004Q2]: pkgsrc/doc Pullup ticket 53 to the pkgsrc-2004Q2 bran...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e1da54ef56a
branches:  pkgsrc-2004Q2
changeset: 476726:0e1da54ef56a
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Jul 13 14:12:03 2004 +0000

description:
Pullup ticket 53 to the pkgsrc-2004Q2 branch, requested by Lubomir Sedlacik.

Fix Solaris build.

        Module Name:    pkgsrc
        Committed By:   salo
        Date:           Sat Jul 10 17:39:50 UTC 2004

        Modified Files:
                pkgsrc/archivers/arj: Makefile distinfo
                pkgsrc/archivers/arj/patches: patch-ab

        Log Message:
        Use GNU ld specific script only when GNU ld is used.
        Fixes build on Solaris with native linker.

diffstat:

 archivers/arj/Makefile         |   3 ++-
 archivers/arj/distinfo         |   4 ++--
 archivers/arj/patches/patch-ab |  39 +++++++++++++++++++++++++++++++++------
 doc/CHANGES-pkgsrc-2004Q2      |   4 +++-
 4 files changed, 40 insertions(+), 10 deletions(-)

diffs (106 lines):

diff -r f8cf4ca7ebc4 -r 0e1da54ef56a archivers/arj/Makefile
--- a/archivers/arj/Makefile    Tue Jul 13 14:05:26 2004 +0000
+++ b/archivers/arj/Makefile    Tue Jul 13 14:12:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/04/27 17:16:28 tv Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2004/07/13 14:12:03 agc Exp $
 # FreeBSD Id: ports/archivers/arj/Makefile,v 1.2 2002/09/17 05:17:29 ijliao Exp
 
 DISTNAME=      arj-3.10.20
@@ -18,6 +18,7 @@
 CONFIGURE_SCRIPT=      ${WRKSRC}/gnu/configure
 MAKEFILE=              makefile.gnu
 MAKE_FLAGS+=           INSTALL_DIR=${INSTALL_PROGRAM_DIR:Q}
+CONFIGURE_ENV+=                LD=${LD:Q}
 
 INSTALL_UNSTRIPPED=    yes # $LOCALBASE/bin/arj must have symbol table
 ARJ_DOCSDIR=           ${PREFIX}/share/doc/arj
diff -r f8cf4ca7ebc4 -r 0e1da54ef56a archivers/arj/distinfo
--- a/archivers/arj/distinfo    Tue Jul 13 14:05:26 2004 +0000
+++ b/archivers/arj/distinfo    Tue Jul 13 14:12:03 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2004/04/27 17:16:28 tv Exp $
+$NetBSD: distinfo,v 1.4.2.1 2004/07/13 14:12:03 agc Exp $
 
 SHA1 (arj-3.10.20.tar.gz) = ce818c8127d11efac469c65a9f65572be7e07a5a
 Size (arj-3.10.20.tar.gz) = 428054 bytes
 SHA1 (patch-aa) = 627dfb018aad8c624c5c88e4f4fdb39bee159b36
-SHA1 (patch-ab) = f5bf9af0bc17ac0bda05d5884d5ef32863dc70ab
+SHA1 (patch-ab) = c588776f9b8e2331471be07e6acd3b873af84fbc
 SHA1 (patch-ac) = 4e557fa98bc92e033d11e2e9a8e34127275f7f72
diff -r f8cf4ca7ebc4 -r 0e1da54ef56a archivers/arj/patches/patch-ab
--- a/archivers/arj/patches/patch-ab    Tue Jul 13 14:05:26 2004 +0000
+++ b/archivers/arj/patches/patch-ab    Tue Jul 13 14:12:03 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/04/27 17:16:28 tv Exp $
+$NetBSD: patch-ab,v 1.3.2.1 2004/07/13 14:12:03 agc Exp $
 
---- gnu/configure.in.orig      Sat Apr 17 07:28:06 2004
-+++ gnu/configure.in
-@@ -12,7 +12,7 @@ dnl Installation script (let it be, temp
+--- gnu/configure.in.orig      Sat Apr 17 13:28:06 2004
++++ gnu/configure.in   Sat Jul 10 19:24:37 2004
+@@ -12,7 +12,7 @@
  AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])
  
  dnl Configuration parameters
@@ -11,7 +11,24 @@
  
  dnl Checks for the canonical system name
  AC_CANONICAL_HOST
-@@ -36,6 +36,7 @@ AC_FUNC_SETVBUF_REVERSED
+@@ -19,6 +19,16 @@
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
++AC_DEFUN(AC_PROG_LD_GNU,
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++  ac_cv_prog_gnu_ld=yes
++else
++  ac_cv_prog_gnu_ld=no
++fi])
++])
++AC_PROG_LD_GNU
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+@@ -36,6 +46,7 @@
  AC_TYPE_SIGNAL
  AC_FUNC_VPRINTF
  AC_CHECK_FUNCS([getcwd min max mkdir mkdtemp rmdir fcloseall strcasecmp setpriority strdup strerror strstr strupr strlwr strtol strtoul])
@@ -19,7 +36,17 @@
  
  dnl Platform-specific tuning
  PROG_EXT=
-@@ -115,7 +116,7 @@ dnl Initial setup
+@@ -68,7 +79,9 @@
+         CFLAGS="-DSUNOS -D_UNIX"
+         DLL_FLAGS="-shared -fPIC"
+         DLL_CFLAGS="-shared -fPIC"
++      if test X"$ac_cv_prog_gnu_ld" = X"yes"; then
+         LD_STRIP="gnu/stripgcc.lnk"
++      fi
+       ;;
+ os2*)
+       PROG_EXT=".exe"
+@@ -115,7 +128,7 @@
  
  test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
  AC_SUBST(CONFIG_SHELL)
diff -r f8cf4ca7ebc4 -r 0e1da54ef56a doc/CHANGES-pkgsrc-2004Q2
--- a/doc/CHANGES-pkgsrc-2004Q2 Tue Jul 13 14:05:26 2004 +0000
+++ b/doc/CHANGES-pkgsrc-2004Q2 Tue Jul 13 14:12:03 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.19 2004/07/13 14:05:27 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.20 2004/07/13 14:12:03 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q2 branch:
@@ -34,3 +34,5 @@
        Solaris bulk build fixes
 Pullup ticket 52, requested by Grant Beattie [agc 2004-07-13]
        Solaris netpbm build fix
+Pullup ticket 53, requested by Lubomir Sedlacik [agc 2004-07-13]
+       Solaris arj build fix