pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q1]: pkgsrc/print/hpijs Pullup ticket 394 - requested by D...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d323bb18cdd7
branches: pkgsrc-2005Q1
changeset: 490874:d323bb18cdd7
user: snj <snj%pkgsrc.org@localhost>
date: Sun Mar 27 05:55:04 2005 +0000
description:
Pullup ticket 394 - requested by Dan McMahill
portability fix for hpijs
Revisions pulled up:
- pkgsrc/print/hpijs/distinfo 1.8
- pkgsrc/print/hpijs/patches/patch-aa 1.4
- pkgsrc/print/hpijs/patches/patch-ab 1.3
- pkgsrc/print/hpijs/patches/patch-ac 1.1
Module Name: pkgsrc
Committed By: dmcmahill
Date: Sat Mar 26 13:59:33 UTC 2005
Modified Files:
pkgsrc/print/hpijs: distinfo
Added Files:
pkgsrc/print/hpijs/patches: patch-aa patch-ab patch-ac
Log Message:
add autoconf tests to find what librarary connect, socket, recv, send,
and gethostbyname are in. On some systems, you need -lsocket and -lnsl
for these (solaris). Tested on NetBSD and Solaris-9.
diffstat:
print/hpijs/distinfo | 5 +-
print/hpijs/patches/patch-aa | 13 +
print/hpijs/patches/patch-ab | 451 +++++++++++++++++++++++++++++++++++++++++++
print/hpijs/patches/patch-ac | 12 +
4 files changed, 480 insertions(+), 1 deletions(-)
diffs (truncated from 501 to 300 lines):
diff -r 4705ecaa3f43 -r d323bb18cdd7 print/hpijs/distinfo
--- a/print/hpijs/distinfo Sun Mar 27 05:32:41 2005 +0000
+++ b/print/hpijs/distinfo Sun Mar 27 05:55:04 2005 +0000
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 12:51:43 agc Exp $
+$NetBSD: distinfo,v 1.7.2.1 2005/03/27 05:55:04 snj Exp $
SHA1 (hpijs-1.7.1.tar.gz) = 7ed373a059ba01d9fc2f6f4181e33d49f08d0389
RMD160 (hpijs-1.7.1.tar.gz) = ecf40047d7bca2913785ddb4e741b1efb47f0799
Size (hpijs-1.7.1.tar.gz) = 845193 bytes
+SHA1 (patch-aa) = 1d89574d8f54cec6493304a663c0f546bd8df111
+SHA1 (patch-ab) = cf2224faf7bb81b6d656a3fe19c668413a54707c
+SHA1 (patch-ac) = b6bd6df7a30152df93d579e12d2b465f15c130c8
diff -r 4705ecaa3f43 -r d323bb18cdd7 print/hpijs/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/hpijs/patches/patch-aa Sun Mar 27 05:55:04 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3.10.1 2005/03/27 05:55:04 snj Exp $
+
+--- configure.in.orig 2004-10-14 19:23:55.000000000 -0400
++++ configure.in
+@@ -151,5 +151,8 @@ dnl Checks for library functions.
+ AC_FUNC_MEMCMP
+ AC_CHECK_FUNCS(strtod strtol)
+ AC_CHECK_FUNC(pow, , AC_CHECK_LIB(m, pow))
++AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
++AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
++AC_CHECK_FUNCS(recv send connect)
+
+ AC_OUTPUT(Makefile)
diff -r 4705ecaa3f43 -r d323bb18cdd7 print/hpijs/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/hpijs/patches/patch-ab Sun Mar 27 05:55:04 2005 +0000
@@ -0,0 +1,451 @@
+$NetBSD: patch-ab,v 1.2.12.1 2005/03/27 05:55:04 snj Exp $
+
+--- configure.orig 2004-10-14 19:30:28.000000000 -0400
++++ configure 2005-03-25 19:55:49.829791000 -0500
+@@ -5060,4 +5060,446 @@
+ fi
+
++echo "$as_me:$LINENO: checking for gethostbyname" >&5
++echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
++if test "${ac_cv_func_gethostbyname+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define gethostbyname innocuous_gethostbyname
++
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char gethostbyname (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef gethostbyname
++
++/* Override any gcc2 internal prototype to avoid an error. */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char gethostbyname ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
++choke me
++#else
++char (*f) () = gethostbyname;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != gethostbyname;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_func_gethostbyname=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_gethostbyname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
++if test $ac_cv_func_gethostbyname = yes; then
++ :
++else
++
++echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++/* Override any gcc2 internal prototype to avoid an error. */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char gethostbyname ();
++int
++main ()
++{
++gethostbyname ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_lib_nsl_gethostbyname=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_nsl_gethostbyname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
++if test $ac_cv_lib_nsl_gethostbyname = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBNSL 1
++_ACEOF
++
++ LIBS="-lnsl $LIBS"
++
++fi
++
++fi
++
++echo "$as_me:$LINENO: checking for socket" >&5
++echo $ECHO_N "checking for socket... $ECHO_C" >&6
++if test "${ac_cv_func_socket+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++/* Define socket to an innocuous variant, in case <limits.h> declares socket.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define socket innocuous_socket
++
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char socket (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef socket
++
++/* Override any gcc2 internal prototype to avoid an error. */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char socket ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined (__stub_socket) || defined (__stub___socket)
++choke me
++#else
++char (*f) () = socket;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != socket;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_func_socket=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_socket=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
++echo "${ECHO_T}$ac_cv_func_socket" >&6
Home |
Main Index |
Thread Index |
Old Index