From 706e5e247d3a4d554d6c6d400acd3ac25d591e0b Mon Sep 17 00:00:00 2001 From: skrll Date: Wed, 13 Feb 2002 22:15:54 +0000 Subject: Remove need for a BUILD_DEPENDS on autoconf by providing a patch to the configure script. --- comms/jpilot/Makefile | 4 +- comms/jpilot/distinfo | 3 +- comms/jpilot/patches/patch-ae | 514 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 517 insertions(+), 4 deletions(-) create mode 100644 comms/jpilot/patches/patch-ae (limited to 'comms/jpilot') diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index 5d5e599c9a8..7f297b4ab62 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2002/01/28 14:24:16 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2002/02/13 22:15:54 skrll Exp $ # DISTNAME= jpilot-0.99 @@ -10,7 +10,6 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://jpilot.org/ COMMENT= desktop organizer application for the palm pilot -BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf BUILD_USES_MSGFMT= # defined CONFLICTS+= jpilot-libplugin-[0-9]* @@ -33,7 +32,6 @@ post-extract: ${RM} -f ${WRKSRC}/po/Makefile.in pre-configure: - cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf --force ${SED} "s|@PREFIX@|${PREFIX}|g" ${WRKSRC}/docs/jpilot.1 \ > ${WRKSRC}/docs/jpilot.1.patched && \ ${MV} ${WRKSRC}/docs/jpilot.1.patched ${WRKSRC}/docs/jpilot.1 diff --git a/comms/jpilot/distinfo b/comms/jpilot/distinfo index 4fa17555a38..2012348540a 100644 --- a/comms/jpilot/distinfo +++ b/comms/jpilot/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/01/28 14:23:40 wiz Exp $ +$NetBSD: distinfo,v 1.5 2002/02/13 22:15:54 skrll Exp $ SHA1 (jpilot-0.99.tar.gz) = d52e4b31872c1b20bf882c8a062fdb954c8f4b1f Size (jpilot-0.99.tar.gz) = 488619 bytes @@ -6,3 +6,4 @@ SHA1 (patch-aa) = 4773e948de2d499cdb07f735d5cbc46c1fde5b92 SHA1 (patch-ab) = 16b18f6b1bdff8e0b97cf975c0dd3e85181fe9c0 SHA1 (patch-ac) = 1dfab3f52134426e362d9bf1a11cad036d5981e7 SHA1 (patch-ad) = ae9ebca51baaca6f2542a2ac9fbd98e31f85ac34 +SHA1 (patch-ae) = 2b61c5fdbd9694150cc557b675c8c52528e37fde diff --git a/comms/jpilot/patches/patch-ae b/comms/jpilot/patches/patch-ae new file mode 100644 index 00000000000..4ec1b973b60 --- /dev/null +++ b/comms/jpilot/patches/patch-ae @@ -0,0 +1,514 @@ +$NetBSD: patch-ae,v 1.1 2002/02/13 22:15:55 skrll Exp $ + +--- configure.orig Fri Feb 8 23:43:47 2002 ++++ configure +@@ -3633,6 +3633,9 @@ + < $srcdir/po/POTFILES.in > po/POTFILES + + ++# Use PKGLOCALEDIR to determine location of installed locale files. ++DATADIRNAME="${PKGLOCALEDIR}" ++ + if test "x$MSGFMT" = "xno"; then + if test "x$GMSGFMT" = "xno"; then + echo "$ac_t""I can't find gettext" 1>&6 +@@ -3655,7 +3658,7 @@ + fi + + echo $ac_n "checking for pilot-link header files""... $ac_c" 1>&6 +-echo "configure:3659: checking for pilot-link header files" >&5 ++echo "configure:3662: checking for pilot-link header files" >&5 + pilotinclude=${FORCE_PILOT_INCLUDES:-no} + if test $pilotinclude = no ; then + for pilot_incl in $pilot_prefix/include /usr/include /usr/local/include \ +@@ -3677,7 +3680,7 @@ + + + echo $ac_n "checking for pilot library files""... $ac_c" 1>&6 +-echo "configure:3681: checking for pilot library files" >&5 ++echo "configure:3684: checking for pilot library files" >&5 + pilotlibs=${FORCE_PILOT_LIBS:-no} + PILOT_LIBS="-lpisock" + +@@ -3710,7 +3713,7 @@ + fi + + echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 +-echo "configure:3714: checking for main in -lsocket" >&5 ++echo "configure:3717: checking for main in -lsocket" >&5 + ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3718,14 +3721,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -3757,7 +3760,7 @@ + + if test "x$enable_pl_test" = "xyes"; then + echo $ac_n "checking to see if I can compile a pilot link program""... $ac_c" 1>&6 +-echo "configure:3761: checking to see if I can compile a pilot link program" >&5 ++echo "configure:3764: checking to see if I can compile a pilot link program" >&5 + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PILOT_FLAGS" + ac_save_LIBS="$LIBS" +@@ -3766,7 +3769,7 @@ + pilotcompile=no + + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + pilotcompile=yes + else +@@ -3810,18 +3813,18 @@ + + if test "x$enable_plugins" = "xyes"; then + echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +-echo "configure:3814: checking for dlopen" >&5 ++echo "configure:3817: checking for dlopen" >&5 + save_LIBS="$LIBS" + LIBS="$LIBS -ldl" + cat > conftest.$ac_ext < + int main() { + dlopen("huh",0); + ; return 0; } + EOF +-if { (eval echo configure:3825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + have_dlopen=yes + else +@@ -3831,6 +3834,25 @@ + rm -f conftest* + LIBS="$save_LIBS" + ++ if test "x$have_dlopen" != "yes"; then ++ cat > conftest.$ac_ext < ++int main() { ++dlopen("huh",0); ++; return 0; } ++EOF ++if { (eval echo configure:3847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ have_dlopen=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++fi ++rm -f conftest* ++ fi ++ + if test "x$have_dlopen" = "xyes"; then + cat >> confdefs.h <<\EOF + #define ENABLE_PLUGINS 1 +@@ -3866,7 +3888,7 @@ + # Check whether --with-gtk-prefix or --without-gtk-prefix was given. + if test "${with_gtk_prefix+set}" = set; then + withval="$with_gtk_prefix" +- gtk_config_prefix="$withval" ++ gtk_config_prefix="" + else + gtk_config_prefix="" + fi +@@ -3913,7 +3935,7 @@ + # Extract the first word of "gtk-config", so it can be a program name with args. + set dummy gtk-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3917: checking for $ac_word" >&5 ++echo "configure:3939: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3948,7 +3970,7 @@ + + min_gtk_version=1.2.0 + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +-echo "configure:3952: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:3974: checking for GTK - version >= $min_gtk_version" >&5 + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes +@@ -3971,7 +3993,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -4049,7 +4071,7 @@ + } + + EOF +-if { (eval echo configure:4053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -4083,7 +4105,7 @@ + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + cat > conftest.$ac_ext < +@@ -4093,7 +4115,7 @@ + return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:4097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" +@@ -4133,12 +4155,12 @@ + + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:4137: checking for ANSI C header files" >&5 ++echo "configure:4159: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -4146,7 +4168,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4163,7 +4185,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -4181,7 +4203,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -4202,7 +4224,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -4213,7 +4235,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:4217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -4237,12 +4259,12 @@ + fi + + echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 +-echo "configure:4241: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++echo "configure:4263: checking for sys/wait.h that is POSIX.1 compatible" >&5 + if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -4258,7 +4280,7 @@ + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; return 0; } + EOF +-if { (eval echo configure:4262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_sys_wait_h=yes + else +@@ -4282,17 +4304,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:4286: checking for $ac_hdr" >&5 ++echo "configure:4308: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4320,12 +4342,12 @@ + + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:4324: checking for pid_t" >&5 ++echo "configure:4346: checking for pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -4353,12 +4375,12 @@ + fi + + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:4357: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:4379: checking whether time.h and sys/time.h may both be included" >&5 + if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -4367,7 +4389,7 @@ + struct tm *tp; + ; return 0; } + EOF +-if { (eval echo configure:4371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes + else +@@ -4388,12 +4410,12 @@ + fi + + echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 +-echo "configure:4392: checking whether struct tm is in sys/time.h or time.h" >&5 ++echo "configure:4414: checking whether struct tm is in sys/time.h or time.h" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -4401,7 +4423,7 @@ + struct tm *tp; tp->tm_sec; + ; return 0; } + EOF +-if { (eval echo configure:4405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_tm=time.h + else +@@ -4423,12 +4445,12 @@ + + + echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +-echo "configure:4427: checking return type of signal handlers" >&5 ++echo "configure:4449: checking return type of signal handlers" >&5 + if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -4445,7 +4467,7 @@ + int i; + ; return 0; } + EOF +-if { (eval echo configure:4449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_signal=void + else +@@ -4464,12 +4486,12 @@ + + + echo $ac_n "checking for strftime""... $ac_c" 1>&6 +-echo "configure:4468: checking for strftime" >&5 ++echo "configure:4490: checking for strftime" >&5 + if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_strftime=yes" + else +@@ -4514,7 +4536,7 @@ + echo "$ac_t""no" 1>&6 + # strftime is in -lintl on SCO UNIX. + echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 +-echo "configure:4518: checking for strftime in -lintl" >&5 ++echo "configure:4540: checking for strftime in -lintl" >&5 + ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4522,7 +4544,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lintl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4560,7 +4582,7 @@ + fi + + echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 +-echo "configure:4564: checking whether utime accepts a null argument" >&5 ++echo "configure:4586: checking whether utime accepts a null argument" >&5 + if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4570,7 +4592,7 @@ + ac_cv_func_utime_null=no + else + cat > conftest.$ac_ext < + #include +@@ -4581,7 +4603,7 @@ + && t.st_mtime - s.st_mtime < 120)); + } + EOF +-if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_utime_null=yes + else +@@ -4609,12 +4631,12 @@ + getcwd strerror + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:4613: checking for $ac_func" >&5 ++echo "configure:4635: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -4664,12 +4686,12 @@ + for ac_func in setenv + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:4668: checking for $ac_func" >&5 ++echo "configure:4690: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else -- cgit v1.2.3