| @@ -1,38 +1,48 @@ | | | @@ -1,38 +1,48 @@ |
1 | $NetBSD: patch-configure.ac,v 1.13 2024/04/15 10:25:57 micha Exp $ | | 1 | $NetBSD: patch-configure.ac,v 1.14 2024/04/27 19:19:26 schmonz Exp $ |
2 | | | 2 | |
3 | Use the same path for all platforms in pkgsrc. | | 3 | Use the same path for all platforms in pkgsrc. |
4 | Fix nonportable shell syntax. | | 4 | Fix nonportable shell syntax. |
| | | 5 | Don't build macOS-specific .app. |
5 | | | 6 | |
6 | --- configure.ac.orig 2024-02-10 22:00:40.000000000 +0000 | | 7 | --- configure.ac.orig 2024-02-10 22:00:40.000000000 +0000 |
7 | +++ configure.ac | | 8 | +++ configure.ac |
8 | @@ -92,8 +92,7 @@ if test -z "${LIBPOSTFIX++}"; then | | 9 | @@ -92,8 +92,7 @@ if test -z "${LIBPOSTFIX++}"; then |
9 | case "${host_os}" in | | 10 | case "${host_os}" in |
10 | *linux* ) | | 11 | *linux* ) |
11 | case "${host_cpu}" in | | 12 | case "${host_cpu}" in |
12 | - aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) | | 13 | - aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) |
13 | - LIBPOSTFIX="64" | | 14 | - LIBPOSTFIX="64" |
14 | + aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) | | 15 | + aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) |
15 | INTGOSIZE=64 | | 16 | INTGOSIZE=64 |
16 | ;; | | 17 | ;; |
17 | esac | | 18 | esac |
18 | @@ -101,7 +100,6 @@ if test -z "${LIBPOSTFIX++}"; then | | 19 | @@ -101,7 +100,6 @@ if test -z "${LIBPOSTFIX++}"; then |
19 | *solaris* ) | | 20 | *solaris* ) |
20 | case "${host_cpu}" in | | 21 | case "${host_cpu}" in |
21 | x86_64 | sparc64 ) | | 22 | x86_64 | sparc64 ) |
22 | - LIBPOSTFIX="/64" | | 23 | - LIBPOSTFIX="/64" |
23 | INTGOSIZE=64 | | 24 | INTGOSIZE=64 |
24 | ;; | | 25 | ;; |
25 | esac | | 26 | esac |
| | | 27 | @@ -155,7 +153,7 @@ AC_DEFINE_UNQUOTED(PATHSEPARATOR,"$PATHS |
| | | 28 | AM_CONDITIONAL(WITH_WIN32, [test "$UWIN" = "yes" -o "$CYGWIN" = "yes" -o "$MINGW32" = "yes"]) |
| | | 29 | AM_CONDITIONAL(WITH_CYGWIN, [test "$CYGWIN" = "yes"]) |
| | | 30 | AM_CONDITIONAL(WITH_MINGW, [test "$MINGW32" = "yes"]) |
| | | 31 | -AM_CONDITIONAL(WITH_DARWIN, [test "$DARWIN" = "yes"]) |
| | | 32 | +AM_CONDITIONAL(WITH_DARWIN, [test "$DARWIN" = "yes-but-pkgsrc-does-not-want-the-mac-app"]) |
| | | 33 | |
| | | 34 | DEFAULT_DPI=96 |
| | | 35 | AC_DEFINE_UNQUOTED(DEFAULT_DPI,$DEFAULT_DPI,Default DPI.) |
26 | @@ -1760,7 +1758,10 @@ AM_CONDITIONAL([WITH_QT], [test "$use_qt | | 36 | @@ -1760,7 +1758,10 @@ AM_CONDITIONAL([WITH_QT], [test "$use_qt |
27 | dnl ----------------------------------- | | 37 | dnl ----------------------------------- |
28 | dnl INCLUDES and LIBS for QUARTZ | | 38 | dnl INCLUDES and LIBS for QUARTZ |
29 | | | 39 | |
30 | -if test "${host_os::6}" = "darwin"; then | | 40 | -if test "${host_os::6}" = "darwin"; then |
31 | +dnl Not suitable for a POSIX shell | | 41 | +dnl Not suitable for a POSIX shell |
32 | +dnl if test "${host_os::6}" = "darwin"; then | | 42 | +dnl if test "${host_os::6}" = "darwin"; then |
33 | +case ${host_os} in | | 43 | +case ${host_os} in |
34 | +darwin*) | | 44 | +darwin*) |
35 | AC_ARG_WITH(quartz, | | 45 | AC_ARG_WITH(quartz, |
36 | [AS_HELP_STRING([--with-quartz=yes],[Quartz framework (Mac OS X)])], | | 46 | [AS_HELP_STRING([--with-quartz=yes],[Quartz framework (Mac OS X)])], |
37 | [],[with_quartz=yes]) | | 47 | [],[with_quartz=yes]) |
38 | @@ -1777,10 +1778,11 @@ if test "${host_os::6}" = "darwin"; then | | 48 | @@ -1777,10 +1778,11 @@ if test "${host_os::6}" = "darwin"; then |