head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.90 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.88 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.86 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.84 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.82 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.80 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.78 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.76 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.74 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.72 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.70 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.68 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.66 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.64 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.62 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.60 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.58 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.56 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.54 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.52 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.50 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.48 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.46 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.42 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.22 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.44 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.40 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.38 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.36 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.34 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.32 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.30 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.28 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.26 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.24 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.20 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.18 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.16 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.14 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.12 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.10 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.8 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.6 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.4 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.2 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.5.0.10 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.8 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.6 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.4 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.2 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.4.0.2 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.3.0.14 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.12 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.10 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.8 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.6 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.4 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.2 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.1.0.40 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.38 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.36 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.34 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.32 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.30 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.28 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.26 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.24 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.22 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.20 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.18 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.16 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.14 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.12 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.10 pkgsrc-2008Q1:1.1.0.8 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.6 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.4 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.2 pkgsrc-2007Q2-base:1.1; locks; strict; comment @# @; 1.7 date 2015.02.19.14.18.52; author wiz; state Exp; branches; next 1.6; commitid pHHvvkpaMCwxRCay; 1.6 date 2015.01.06.17.45.46; author wiz; state Exp; branches; next 1.5; commitid aQh4yGtcvybkqZ4y; 1.5 date 2013.10.27.20.41.49; author joerg; state Exp; branches; next 1.4; commitid EOlDeN9muedApYax; 1.4 date 2013.07.05.13.43.44; author ryoon; state Exp; branches; next 1.3; commitid zGgoymF1r8qoLhWw; 1.3 date 2011.12.31.23.56.47; author dholland; state Exp; branches; next 1.2; 1.2 date 2011.12.31.16.37.25; author dholland; state Exp; branches; next 1.1; 1.1 date 2007.06.11.13.38.33; author markd; state Exp; branches; next ; desc @@ 1.7 log @Add ptyfs support based on the one in emacs24; from Anon. Bump PKGREVISION. @ text @$NetBSD: patch-ab,v 1.6 2015/01/06 17:45:46 wiz Exp $ Caution: the extra cpp checking (the three hunks containing "Should be one line") is manually hacked and not reflected in configure.in; do not regenerate configure with autoconf without merging it. This checking is required because somewhere between gcc 4.1 and 4.5 cpp started doing regrettable things with backslash-escaped newlines. * Fix build on NetBSD 6.99.23, gcc -E -traditional-cpp with native X results syntax error. Use -traditional-cpp for Makefile generation only. --- configure.orig 2003-03-18 09:19:12.000000000 -0500 +++ configure 2015-02-16 21:19:13.000000000 -0500 @@@@ -821,10 +821,18 @@@@ case "${canonical}" in powerpc-*-netbsd*) machine=macppc ;; sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*) machine=vax ;; - arm-*-netbsd*) machine=arm ;; + arm*-*-netbsd*) machine=arm ;; + x86_64-*-netbsd*) machine=amd64 ;; + hppa-*-netbsd*) machine=hp800 ;; + shle-*-netbsd*) machine=sh3el ;; esac ;; + ## Darwin / Mac OS X + powerpc-apple-darwin* ) + machine=powermac opsys=darwin ;; + i386-apple-darwin* ) + machine=intel386 opsys=darwin ;; ## OpenBSD ports *-*-openbsd* ) opsys=openbsd @@@@ -909,6 +917,10 @@@@ case "${canonical}" in machine=macppc opsys=gnu-linux ;; + x86_64-*-linux* ) + machine=amd64 opsys=gnu-linux + ;; + ## Altos 3068 m68*-altos-sysv* ) machine=altos opsys=usg5-2 @@@@ -1659,6 +1671,7 @@@@ case "${canonical}" in *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-386bsd* ) opsys=386bsd ;; *-freebsd* ) opsys=freebsd ;; + *-dragonfly* ) opsys=dragonfly ;; *-nextstep* ) opsys=nextstep ;; ## Otherwise, we'll fall through to the generic opsys code at the bottom. esac @@@@ -2052,15 +2065,20 @@@@ else CPP="${CC-cc} -E" # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. + # And, gcc 4.5? and up does not preserve escaped newlines, which is + # fatal for preprocessing makefiles. cat > conftest.$ac_ext < Syntax Error +Should be one line. EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" { (eval echo configure:2063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ + grep -L "Should *be one line" conftest2.out \ + ` if test -z "$ac_err"; then : else @@@@ -2068,16 +2086,19 @@@@ else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" + CPP="${CC-cc} -E" cat > conftest.$ac_ext < Syntax Error +Should be one line. EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" { (eval echo configure:2080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ + grep -L "Should *be one line" conftest2.out \ + ` if test -z "$ac_err"; then : else @@@@ -2091,10 +2112,13 @@@@ else #include "confdefs.h" #include Syntax Error +Should be one line. EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" { (eval echo configure:2097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ + grep -L "Should *be one line" conftest2.out \ + ` if test -z "$ac_err"; then : else @@@@ -2416,7 +2440,7 @@@@ ac_link="$ac_link $ld_switch_machine $ld if test x"${OVERRIDE_CPPFLAGS}" != x; then CPPFLAGS="${OVERRIDE_CPPFLAGS}" else - CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS" + CPPFLAGS="`echo $c_switch_system $c_switch_machine $CPPFLAGS | sed 's,-L[^ ]*,,g'`" fi @@@@ -5583,24 +5607,24 @@@@ if eval "test \"`echo '$ac_cv_header_'$a echo "$ac_t""yes" 1>&6 # EGifPutExtensionLast only exists from version libungif-4.1.0b1. # Earlier versions can crash Emacs. - echo $ac_n "checking for EGifPutExtensionLast in -lungif""... $ac_c" 1>&6 -echo "configure:5588: checking for EGifPutExtensionLast in -lungif" >&5 -ac_lib_var=`echo ungif'_'EGifPutExtensionLast | sed 'y%./+-%__p_%'` + echo $ac_n "checking for EGifPutExtensionTrailer in -lgif""... $ac_c" 1>&6 +echo "configure:5588: checking for EGifPutExtensionTrailer in -lgif" >&5 +ac_lib_var=`echo ungif'_'EGifPutExtensionTrailer | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lungif $LIBS" +LIBS="-lgif $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then @@@@ -9124,6 +9148,60 @@@@ EOF fi +# NETBSD: NetBSD's newer run-time linker fix. +if test $opsys = netbsd; then + if test -f /usr/lib/crti.o; then + cat >> confdefs.h <<\EOF +#define HAVE_NETBSD_CRTI 1 +EOF + + fi + if test -f /usr/lib/crtn.o; then + cat >> confdefs.h <<\EOF +#define HAVE_NETBSD_CRTN 1 +EOF + + fi +fi + +# XXX: handcoded test for ptyfs +echo $ac_n "checking for ptyfs""... $ac_c" 1>&6 +echo "configure:9095: checking for ptyfs" >&5 +cat > conftest.$ac_ext < +#include + +int +main(void) +{ + int fd; + + fd = posix_openpt(O_RDWR); + if (fd == -1) + return 1; + close(fd); + return 0; +} +EOF +if { (eval echo configure:9185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_have_ptyfs=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_have_ptyfs=no +fi +rm -fr conftest* + +echo "$ac_t""$ac_cv_have_ptyfs" 1>&6 +if test $ac_cv_have_ptyfs = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_PTYFS 1 +EOF +fi + # Set up the CFLAGS for real compilation, so we can substitute it. CFLAGS="$REAL_CFLAGS" CPPFLAGS="$REAL_CPPFLAGS" @@@@ -9735,7 +9813,7 @@@@ echo creating lib-src/Makefile sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ < Makefile.c > junk.c - $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ + $TRADCPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new rm -f junk.c junk1.c junk2.c @@@@ -9751,7 +9829,7 @@@@ echo creating src/Makefile sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ < Makefile.c > junk.c - $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ + $TRADCPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new rm -f junk.c junk1.c junk2.c @ 1.6 log @Recognize more arms. From Anon. @ text @d1 1 a1 1 $NetBSD$ d13 1 a13 1 +++ configure 2015-01-05 04:09:09.000000000 -0500 d155 1 a155 1 @@@@ -9124,6 +9148,22 @@@@ EOF d175 38 d216 1 a216 1 @@@@ -9735,7 +9777,7 @@@@ echo creating lib-src/Makefile d225 1 a225 1 @@@@ -9751,7 +9793,7 @@@@ echo creating src/Makefile @ 1.5 log @Use tradcpp for clang build, fallback to cpp -traditional otherwise. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2013/07/05 13:43:44 ryoon Exp $ d12 4 a15 3 --- configure.orig 2003-03-18 14:19:12.000000000 +0000 +++ configure @@@@ -822,9 +824,17 @@@@ case "${canonical}" in d18 2 a19 1 arm-*-netbsd*) machine=arm ;; d34 1 a34 1 @@@@ -909,6 +919,10 @@@@ case "${canonical}" in d45 1 a45 1 @@@@ -1659,6 +1673,7 @@@@ case "${canonical}" in d53 1 a53 1 @@@@ -2052,15 +2067,20 @@@@ else d76 1 a76 1 @@@@ -2068,16 +2088,19 @@@@ else d99 1 a99 1 @@@@ -2091,10 +2114,13 @@@@ else d115 1 a115 1 @@@@ -2416,7 +2442,7 @@@@ ac_link="$ac_link $ld_switch_machine $ld d124 1 a124 1 @@@@ -5583,24 +5619,24 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d155 1 a155 1 @@@@ -9124,6 +9160,22 @@@@ EOF d178 1 a178 1 @@@@ -9735,7 +9793,7 @@@@ echo creating lib-src/Makefile d187 1 a187 1 @@@@ -9751,7 +9809,7 @@@@ echo creating src/Makefile @ 1.4 log @Bump PKGREVISION. * Fix build for giflib 5.0.4. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2011/12/31 23:56:47 dholland Exp $ d14 1 a14 1 @@@@ -822,9 +822,17 @@@@ case "${canonical}" in d32 1 a32 1 @@@@ -909,6 +917,10 @@@@ case "${canonical}" in d43 1 a43 1 @@@@ -1659,6 +1671,7 @@@@ case "${canonical}" in d51 1 a51 1 @@@@ -2052,15 +2065,20 @@@@ else d74 1 a74 1 @@@@ -2068,16 +2086,19 @@@@ else d97 1 a97 1 @@@@ -2091,10 +2112,13 @@@@ else d113 10 a122 1 @@@@ -5583,24 +5607,24 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d153 1 a153 1 @@@@ -9124,6 +9148,22 @@@@ EOF d176 1 a176 1 @@@@ -9735,7 +9777,7 @@@@ echo creating lib-src/Makefile d181 1 a181 1 + $CPP -traditional-cpp $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ d185 1 a185 1 @@@@ -9751,7 +9793,7 @@@@ echo creating src/Makefile d190 1 a190 1 + $CPP -traditional-cpp $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ @ 1.3 log @try again. sigh... @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2011/12/31 16:37:25 dholland Exp $ d9 3 d51 1 a51 1 @@@@ -2052,15 +2065,21 @@@@ else d62 1 a62 2 +Should \\ +be one line. d74 8 a81 1 @@@@ -2074,10 +2093,14 @@@@ else d85 1 a85 2 +Should \\ +be one line. d97 1 a97 1 @@@@ -2091,10 +2114,14 @@@@ else d101 1 a101 2 +Should \\ +be one line. d113 32 a144 1 @@@@ -9124,6 +9151,22 @@@@ EOF d167 18 @ 1.2 log @Merge the improved cpp checks from emacs20's patch-ab. Should fix build breakage on -current. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2007/06/11 13:38:33 markd Exp $ d67 1 a67 1 + grep -L "Should *be one line" contest2.out \ d84 1 a84 1 + grep -L "Should *be one line" contest2.out \ d101 1 a101 1 + grep -L "Should *be one line" contest2.out \ @ 1.1 log @Reimport existing emacs packages as emacs21{,-nox11} to allow subsequent update of emacs packages to version 22. @ text @d1 7 a7 1 $NetBSD: patch-ab,v 1.24 2007/04/22 06:55:03 obache Exp $ d48 59 a106 1 @@@@ -9124,6 +9137,22 @@@@ EOF @