From 85a7ceb76f9c9e6e224b5486e20915df09a117e4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 15 Oct 2009 16:07:47 +0200 Subject: [PATCH] Move all patches to templates/$pkgname/patches. There's no need to set patch_files/patch_args anymore, all patches in this directory will be applied with -Np0 and they have .diff or .patch (and .gz/.bz2) extension. --HG-- extra : convert_revision : 8d516c033fe34db94ebbcc84c246e84fc96ed901 --- .../xbps_changes.diff} | 0 templates/OpenRC/template | 1 - .../disable_rpath.diff} | 0 .../disable_rpath.diff} | 0 .../fix_extensions_rpath.diff} | 0 .../Makefile_fix_install.diff} | 0 .../Makefile_libbz2_so_fix_soname.diff} | 0 templates/cdparanoia/{ => patches}/gcc.diff | 0 templates/cdparanoia/template | 1 - .../fix_pam_crond.diff} | 0 .../fix_Makefile.diff} | 0 .../fix_install.diff} | 0 .../dont_run_fccache.diff} | 0 templates/gcc/gcc-fix-amd64.diff | 16 -- templates/gcc/template | 1 - .../fix_installation.diff} | 0 .../disable_examples_install.diff} | 0 .../fix_open_mode.diff} | 0 templates/gkrellm/gkrellm-fix-sensors.diff | 11 -- .../disable_timezone.diff} | 0 .../glibc/{ => patches}/xattr.h-dupdefs.diff | 0 templates/glibc/template | 1 - .../fix_build_newer_glibc.diff} | 0 .../configure_fix_smbios_test.diff} | 0 .../fix_install.diff} | 0 .../{build.diff => patches/fix_rdisc.c.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../fix_scsi_varlen_cdb_hdr.diff} | 0 .../unionfs-2.5.3_for_2.6.31.diff.gz | Bin .../unionfs-2.5.3_for_2.6.31.diff.gz.args | 1 + templates/kernel/template | 2 - .../shared_by_default.diff} | 0 .../Makefile_only_shlibs_target.diff} | 0 .../configure_no_pthread_stubs.diff} | 0 .../fix_include_netlink_local_h.diff} | 0 .../libusb/configure_sh_test_invalid.diff | 13 -- .../Makefile_in_only_shlibs.diff} | 0 .../configure_no_pthread_stubs.diff} | 0 templates/mono/build.diff | 183 ------------------ .../{build.diff => patches/misc_fixes.diff} | 0 .../fix_Makefile_in.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../disable_check_config.diff} | 0 .../fix_mandir_path.diff} | 0 .../fix_sharedlib.diff} | 0 .../fix_Makefile.diff} | 0 .../disable_install_stuff.diff} | 0 .../{build.diff => patches/fix_Makefile.diff} | 0 .../fix_Makefile.diff} | 0 .../Makefile_fix_pkgconfig_path.diff} | 0 .../sylpheed/sylpheed-fix-latest-gtk.diff | 67 ------- .../fix_installation.diff} | 0 .../fix_build_scaffold.c.diff} | 0 .../{ => patches}/shared_lib_plus_plus-1.diff | 0 .../{build.diff => patches/fix_Makefile.diff} | 0 .../fix_Makefile.diff} | 0 .../unzipsfx_no_libz.diff} | 0 .../build_blkid_uuid_utils.diff} | 0 templates/util-linux-ng/template | 1 - .../{build.diff => patches/fix_build.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../{build.diff => patches/fix_build.diff} | 0 .../fix_install.diff} | 0 .../configure_build_all_libs.diff} | 0 71 files changed, 1 insertion(+), 297 deletions(-) rename templates/OpenRC/{xbps-changes.diff => patches/xbps_changes.diff} (100%) rename templates/acl/{install.diff => patches/disable_rpath.diff} (100%) rename templates/attr/{install.diff => patches/disable_rpath.diff} (100%) rename templates/babl/{install.diff => patches/fix_extensions_rpath.diff} (100%) rename templates/bzip2/{install.diff => patches/Makefile_fix_install.diff} (100%) rename templates/bzip2/{build.diff => patches/Makefile_libbz2_so_fix_soname.diff} (100%) rename templates/cdparanoia/{ => patches}/gcc.diff (100%) rename templates/cronie/{install.diff => patches/fix_pam_crond.diff} (100%) rename templates/dhcpcd-dbus/{install.diff => patches/fix_Makefile.diff} (100%) rename templates/dhcpcd-gtk/{install.diff => patches/fix_install.diff} (100%) rename templates/fontconfig/{install.diff => patches/dont_run_fccache.diff} (100%) delete mode 100644 templates/gcc/gcc-fix-amd64.diff rename templates/gdbm/{install.diff => patches/fix_installation.diff} (100%) rename templates/gettext/{install.diff => patches/disable_examples_install.diff} (100%) rename templates/gettext/{build.diff => patches/fix_open_mode.diff} (100%) delete mode 100644 templates/gkrellm/gkrellm-fix-sensors.diff rename templates/glibc/{build.diff => patches/disable_timezone.diff} (100%) rename templates/glibc/{ => patches}/xattr.h-dupdefs.diff (100%) rename templates/gzip/{build.diff => patches/fix_build_newer_glibc.diff} (100%) rename templates/hal/{build.diff => patches/configure_fix_smbios_test.diff} (100%) rename templates/iputils/{install.diff => patches/fix_install.diff} (100%) rename templates/iputils/{build.diff => patches/fix_rdisc.c.diff} (100%) rename templates/kbd/{build.diff => patches/fix_build.diff} (100%) rename templates/kernel-libc-headers/{build.diff => patches/fix_scsi_varlen_cdb_hdr.diff} (100%) rename templates/kernel/{ => patches}/unionfs-2.5.3_for_2.6.31.diff.gz (100%) create mode 100644 templates/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz.args rename templates/klibc/{build.diff => patches/shared_by_default.diff} (100%) rename templates/libblkid/{build.diff => patches/Makefile_only_shlibs_target.diff} (100%) rename templates/libdrm/{build.diff => patches/configure_no_pthread_stubs.diff} (100%) rename templates/libnl/{build.diff => patches/fix_include_netlink_local_h.diff} (100%) delete mode 100644 templates/libusb/configure_sh_test_invalid.diff rename templates/libuuid/{build.diff => patches/Makefile_in_only_shlibs.diff} (100%) rename templates/libxcb/{build.diff => patches/configure_no_pthread_stubs.diff} (100%) delete mode 100644 templates/mono/build.diff rename templates/net-tools/{build.diff => patches/misc_fixes.diff} (100%) rename templates/newsyslog/{install.diff => patches/fix_Makefile_in.diff} (100%) rename templates/ntp/{build.diff => patches/fix_build.diff} (100%) rename templates/openssh/{install.diff => patches/disable_check_config.diff} (100%) rename templates/openssl/{install.diff => patches/fix_mandir_path.diff} (100%) rename templates/openssl/{build.diff => patches/fix_sharedlib.diff} (100%) rename templates/pbzip2/{install.diff => patches/fix_Makefile.diff} (100%) rename templates/perl-XML-SAX/{install.diff => patches/disable_install_stuff.diff} (100%) rename templates/portmap/{build.diff => patches/fix_Makefile.diff} (100%) rename templates/procps/{install.diff => patches/fix_Makefile.diff} (100%) rename templates/shared-mime-info/{build.diff => patches/Makefile_fix_pkgconfig_path.diff} (100%) delete mode 100644 templates/sylpheed/sylpheed-fix-latest-gtk.diff rename templates/sysklogd/{install.diff => patches/fix_installation.diff} (100%) rename templates/tcp_wrappers/{build.diff => patches/fix_build_scaffold.c.diff} (100%) rename templates/tcp_wrappers/{ => patches}/shared_lib_plus_plus-1.diff (100%) rename templates/tzdata/{build.diff => patches/fix_Makefile.diff} (100%) rename templates/unzip/{install.diff => patches/fix_Makefile.diff} (100%) rename templates/unzip/{build.diff => patches/unzipsfx_no_libz.diff} (100%) rename templates/util-linux-ng/{patch-build-blkid-uuid-utils.diff => patches/build_blkid_uuid_utils.diff} (100%) rename templates/xf86-input-calcomp/{build.diff => patches/fix_build.diff} (100%) rename templates/xf86-input-citron/{build.diff => patches/fix_build.diff} (100%) rename templates/xf86-input-dmc/{build.diff => patches/fix_build.diff} (100%) rename templates/xf86-input-dynapro/{build.diff => patches/fix_build.diff} (100%) rename templates/xf86-input-elo2300/{build.diff => patches/fix_build.diff} (100%) rename templates/xf86-input-magellan/{build.diff => patches/fix_build.diff} (100%) rename templates/xf86-input-microtouch/{build.diff => patches/fix_build.diff} (100%) rename templates/xf86-input-palmax/{build.diff => patches/fix_build.diff} (100%) rename templates/xf86-input-spaceorb/{build.diff => patches/fix_build.diff} (100%) rename templates/xf86-input-tek4957/{build.diff => patches/fix_build.diff} (100%) rename templates/zip/{install.diff => patches/fix_install.diff} (100%) rename templates/zlib/{build.diff => patches/configure_build_all_libs.diff} (100%) diff --git a/templates/OpenRC/xbps-changes.diff b/templates/OpenRC/patches/xbps_changes.diff similarity index 100% rename from templates/OpenRC/xbps-changes.diff rename to templates/OpenRC/patches/xbps_changes.diff diff --git a/templates/OpenRC/template b/templates/OpenRC/template index cadedfdce7e..7b194c1a422 100644 --- a/templates/OpenRC/template +++ b/templates/OpenRC/template @@ -3,7 +3,6 @@ pkgname=OpenRC version=0.5.0 revision=4 wrksrc=openrc-${version} -patch_files="xbps-changes.diff" distfiles="http://roy.marples.name/downloads/openrc/openrc-$version.tar.bz2" build_style=gnu_makefile short_desc="Universal init system" diff --git a/templates/acl/install.diff b/templates/acl/patches/disable_rpath.diff similarity index 100% rename from templates/acl/install.diff rename to templates/acl/patches/disable_rpath.diff diff --git a/templates/attr/install.diff b/templates/attr/patches/disable_rpath.diff similarity index 100% rename from templates/attr/install.diff rename to templates/attr/patches/disable_rpath.diff diff --git a/templates/babl/install.diff b/templates/babl/patches/fix_extensions_rpath.diff similarity index 100% rename from templates/babl/install.diff rename to templates/babl/patches/fix_extensions_rpath.diff diff --git a/templates/bzip2/install.diff b/templates/bzip2/patches/Makefile_fix_install.diff similarity index 100% rename from templates/bzip2/install.diff rename to templates/bzip2/patches/Makefile_fix_install.diff diff --git a/templates/bzip2/build.diff b/templates/bzip2/patches/Makefile_libbz2_so_fix_soname.diff similarity index 100% rename from templates/bzip2/build.diff rename to templates/bzip2/patches/Makefile_libbz2_so_fix_soname.diff diff --git a/templates/cdparanoia/gcc.diff b/templates/cdparanoia/patches/gcc.diff similarity index 100% rename from templates/cdparanoia/gcc.diff rename to templates/cdparanoia/patches/gcc.diff diff --git a/templates/cdparanoia/template b/templates/cdparanoia/template index e4a5ad1e570..1481b65bd1a 100644 --- a/templates/cdparanoia/template +++ b/templates/cdparanoia/template @@ -2,7 +2,6 @@ pkgname=cdparanoia version=10.2 wrksrc=$pkgname-III-$version -patch_files=gcc.diff distfiles="http://downloads.xiph.org/releases/$pkgname/$pkgname-III-$version.src.tgz" build_style=gnu_configure make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version/usr diff --git a/templates/cronie/install.diff b/templates/cronie/patches/fix_pam_crond.diff similarity index 100% rename from templates/cronie/install.diff rename to templates/cronie/patches/fix_pam_crond.diff diff --git a/templates/dhcpcd-dbus/install.diff b/templates/dhcpcd-dbus/patches/fix_Makefile.diff similarity index 100% rename from templates/dhcpcd-dbus/install.diff rename to templates/dhcpcd-dbus/patches/fix_Makefile.diff diff --git a/templates/dhcpcd-gtk/install.diff b/templates/dhcpcd-gtk/patches/fix_install.diff similarity index 100% rename from templates/dhcpcd-gtk/install.diff rename to templates/dhcpcd-gtk/patches/fix_install.diff diff --git a/templates/fontconfig/install.diff b/templates/fontconfig/patches/dont_run_fccache.diff similarity index 100% rename from templates/fontconfig/install.diff rename to templates/fontconfig/patches/dont_run_fccache.diff diff --git a/templates/gcc/gcc-fix-amd64.diff b/templates/gcc/gcc-fix-amd64.diff deleted file mode 100644 index c576c20e1cc..00000000000 --- a/templates/gcc/gcc-fix-amd64.diff +++ /dev/null @@ -1,16 +0,0 @@ -Override default to match what other debian derivatives do. - -Rather than having lib being a link of lib64, do the the contrary: -use lib and make lib64 a link of it. - ---- gcc/config/i386/t-linux64.orig 2008-10-22 03:33:48.513859286 +0200 -+++ gcc/config/i386/t-linux64 2008-10-22 03:34:27.928844912 +0200 -@@ -13,7 +13,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/templates/gcc/template b/templates/gcc/template index d297046149c..f37d13f533f 100644 --- a/templates/gcc/template +++ b/templates/gcc/template @@ -1,7 +1,6 @@ # Template build file for 'gcc' pkgname=gcc version=4.4.1 -patch_files="$pkgname-fix-amd64.diff" distfiles=" http://ftp.gnu.org/pub/gnu/gcc/$pkgname-$version/$pkgname-$version.tar.bz2" build_style=gnu_configure diff --git a/templates/gdbm/install.diff b/templates/gdbm/patches/fix_installation.diff similarity index 100% rename from templates/gdbm/install.diff rename to templates/gdbm/patches/fix_installation.diff diff --git a/templates/gettext/install.diff b/templates/gettext/patches/disable_examples_install.diff similarity index 100% rename from templates/gettext/install.diff rename to templates/gettext/patches/disable_examples_install.diff diff --git a/templates/gettext/build.diff b/templates/gettext/patches/fix_open_mode.diff similarity index 100% rename from templates/gettext/build.diff rename to templates/gettext/patches/fix_open_mode.diff diff --git a/templates/gkrellm/gkrellm-fix-sensors.diff b/templates/gkrellm/gkrellm-fix-sensors.diff deleted file mode 100644 index 3533308313c..00000000000 --- a/templates/gkrellm/gkrellm-fix-sensors.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sysdeps/netbsd.c.orig 2008-10-10 07:31:19.000000000 +0200 -+++ src/sysdeps/netbsd.c 2008-10-10 07:31:46.000000000 +0200 -@@ -505,7 +505,7 @@ gkrellm_sys_battery_read_data(void) - #endif - } - -- fd = open(SENSORS_DIR, O_RDONLY); -+ fd = open(SENSORS_DIR, O_RDWR); - if (fd < 0) return; - - data.sensor = battery_acpi_data[0].on_line_index; diff --git a/templates/glibc/build.diff b/templates/glibc/patches/disable_timezone.diff similarity index 100% rename from templates/glibc/build.diff rename to templates/glibc/patches/disable_timezone.diff diff --git a/templates/glibc/xattr.h-dupdefs.diff b/templates/glibc/patches/xattr.h-dupdefs.diff similarity index 100% rename from templates/glibc/xattr.h-dupdefs.diff rename to templates/glibc/patches/xattr.h-dupdefs.diff diff --git a/templates/glibc/template b/templates/glibc/template index 804041f05bb..27625d769ea 100644 --- a/templates/glibc/template +++ b/templates/glibc/template @@ -1,7 +1,6 @@ # Template file for 'glibc' pkgname=glibc version=2.10.1 -patch_files="xattr.h-dupdefs.diff" distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2" build_style=gnu_configure configure_script="../configure" diff --git a/templates/gzip/build.diff b/templates/gzip/patches/fix_build_newer_glibc.diff similarity index 100% rename from templates/gzip/build.diff rename to templates/gzip/patches/fix_build_newer_glibc.diff diff --git a/templates/hal/build.diff b/templates/hal/patches/configure_fix_smbios_test.diff similarity index 100% rename from templates/hal/build.diff rename to templates/hal/patches/configure_fix_smbios_test.diff diff --git a/templates/iputils/install.diff b/templates/iputils/patches/fix_install.diff similarity index 100% rename from templates/iputils/install.diff rename to templates/iputils/patches/fix_install.diff diff --git a/templates/iputils/build.diff b/templates/iputils/patches/fix_rdisc.c.diff similarity index 100% rename from templates/iputils/build.diff rename to templates/iputils/patches/fix_rdisc.c.diff diff --git a/templates/kbd/build.diff b/templates/kbd/patches/fix_build.diff similarity index 100% rename from templates/kbd/build.diff rename to templates/kbd/patches/fix_build.diff diff --git a/templates/kernel-libc-headers/build.diff b/templates/kernel-libc-headers/patches/fix_scsi_varlen_cdb_hdr.diff similarity index 100% rename from templates/kernel-libc-headers/build.diff rename to templates/kernel-libc-headers/patches/fix_scsi_varlen_cdb_hdr.diff diff --git a/templates/kernel/unionfs-2.5.3_for_2.6.31.diff.gz b/templates/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz similarity index 100% rename from templates/kernel/unionfs-2.5.3_for_2.6.31.diff.gz rename to templates/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz diff --git a/templates/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz.args b/templates/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz.args new file mode 100644 index 00000000000..2eba1cb3c5c --- /dev/null +++ b/templates/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz.args @@ -0,0 +1 @@ +-Np1 diff --git a/templates/kernel/template b/templates/kernel/template index 3e3257382a9..a0806fb8dce 100644 --- a/templates/kernel/template +++ b/templates/kernel/template @@ -3,8 +3,6 @@ pkgname=kernel _kernel_ver=2.6.31 _kernel_patch_ver=3 version=${_kernel_ver}.${_kernel_patch_ver} -patch_files="unionfs-2.5.3_for_2.6.31.diff.gz" -patch_args="-Np1" wrksrc="linux-$version" distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2" build_style=custom-install diff --git a/templates/klibc/build.diff b/templates/klibc/patches/shared_by_default.diff similarity index 100% rename from templates/klibc/build.diff rename to templates/klibc/patches/shared_by_default.diff diff --git a/templates/libblkid/build.diff b/templates/libblkid/patches/Makefile_only_shlibs_target.diff similarity index 100% rename from templates/libblkid/build.diff rename to templates/libblkid/patches/Makefile_only_shlibs_target.diff diff --git a/templates/libdrm/build.diff b/templates/libdrm/patches/configure_no_pthread_stubs.diff similarity index 100% rename from templates/libdrm/build.diff rename to templates/libdrm/patches/configure_no_pthread_stubs.diff diff --git a/templates/libnl/build.diff b/templates/libnl/patches/fix_include_netlink_local_h.diff similarity index 100% rename from templates/libnl/build.diff rename to templates/libnl/patches/fix_include_netlink_local_h.diff diff --git a/templates/libusb/configure_sh_test_invalid.diff b/templates/libusb/configure_sh_test_invalid.diff deleted file mode 100644 index 520db8b068a..00000000000 --- a/templates/libusb/configure_sh_test_invalid.diff +++ /dev/null @@ -1,13 +0,0 @@ -Incorrect comparision operator that doesn't work in strict POSIX shells. - ---- configure.orig 2009-04-27 00:07:12.146716716 +0200 -+++ configure 2009-04-27 00:07:31.506853126 +0200 -@@ -11255,7 +11255,7 @@ $as_echo "$as_me: error: unsupported ope - { (exit 1); exit 1; }; } - esac - -- if test "x$backend" == "xlinux"; then -+ if test "x$backend" = "xlinux"; then - OS_LINUX_TRUE= - OS_LINUX_FALSE='#' - else diff --git a/templates/libuuid/build.diff b/templates/libuuid/patches/Makefile_in_only_shlibs.diff similarity index 100% rename from templates/libuuid/build.diff rename to templates/libuuid/patches/Makefile_in_only_shlibs.diff diff --git a/templates/libxcb/build.diff b/templates/libxcb/patches/configure_no_pthread_stubs.diff similarity index 100% rename from templates/libxcb/build.diff rename to templates/libxcb/patches/configure_no_pthread_stubs.diff diff --git a/templates/mono/build.diff b/templates/mono/build.diff deleted file mode 100644 index c0a086113e4..00000000000 --- a/templates/mono/build.diff +++ /dev/null @@ -1,183 +0,0 @@ -Jumbo patch containing all patches from pkgsrc, thanks! - -$NetBSD: patch-af,v 1.10 2008/04/19 18:42:10 kefren Exp $ ---- mono/metadata/Makefile.in.orig 2008-03-11 01:37:56.000000000 +0200 -+++ mono/metadata/Makefile.in 2008-03-18 15:35:22.000000000 +0200 -@@ -65,7 +65,7 @@ - libmonoruntime_static_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libmonoruntime_static_la_LDFLAGS) $(LDFLAGS) -o $@ --libmonoruntime_la_LIBADD = -+libmonoruntime_la_LIBADD = $(ICU_LIBS) - am_libmonoruntime_la_OBJECTS = reflection.lo object.lo icall.lo \ - decimal.lo boehm-gc.lo null-gc.lo sgen-gc.lo gc.lo \ - method-builder.lo marshal.lo mono-mlist.lo monitor.lo \ -$NetBSD: patch-cf,v 1.3 2008/10/10 22:02:43 kefren Exp $ ---- mono/metadata/class.c.orig 2008-10-10 23:57:39.000000000 +0300 -+++ mono/metadata/class.c 2008-10-10 23:58:35.000000000 +0300 -@@ -7445,7 +7445,10 @@ - gboolean - mono_class_generic_sharing_enabled (MonoClass *class) - { --#if defined(__i386__) || defined(__x86_64__) -+#if defined(__NetBSD__) && defined(__x86_64__) -+/* https://bugzilla.novell.com/show_bug.cgi?id=434457 */ -+ static gboolean supported = FALSE; -+#elif defined(__i386__) || defined(__x86_64__) - static gboolean supported = TRUE; - #else - /* Not supported by the JIT backends */ -$NetBSD: patch-cd,v 1.1 2008/02/13 14:16:43 kefren Exp $ ---- mono/mini/exceptions-amd64.c.orig 2008-02-05 23:56:30.000000000 +0200 -+++ mono/mini/exceptions-amd64.c 2008-02-05 23:53:28.000000000 +0200 -@@ -682,7 +682,7 @@ mono_arch_handle_exception (void *sigctx - static inline guint64* - gregs_from_ucontext (ucontext_t *ctx) - { --#ifdef __FreeBSD__ -+#if defined (__FreeBSD__) || defined (__NetBSD__) - guint64 *gregs = (guint64 *) &ctx->uc_mcontext; - #else - guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs; -$NetBSD: patch-cc,v 1.1 2008/02/13 14:16:43 kefren Exp $ ---- mono/mini/mini-amd64.h.orig 2008-02-05 23:55:50.000000000 +0200 -+++ mono/mini/mini-amd64.h 2008-02-05 23:51:38.000000000 +0200 -@@ -220,7 +220,7 @@ typedef struct { - - #endif /* PLATFORM_WIN32 */ - --#ifdef __FreeBSD__ -+#if defined (__FreeBSD__) || defined (__NetBSD__) - - #define REG_RAX 7 - #define REG_RCX 4 -$NetBSD: patch-ak,v 1.8 2008/02/13 14:16:43 kefren Exp $ ---- libgc/pthread_support.c.orig 2007-11-09 00:07:02.000000000 +0200 -+++ libgc/pthread_support.c 2008-02-05 14:01:40.000000000 +0200 -@@ -1160,6 +1160,22 @@ void GC_end_blocking(void) { - #define __d10_sleep sleep - #endif /* GC_DGUX386_THREADS */ - -+#undef nanosleep -+#undef usleep -+#undef sleep -+ -+/* A wrapper for the standard C nanosleep function */ -+int WRAP_FUNC(nanosleep) (const struct timespec *rqtp, struct timespec *rmtp) -+{ -+ int result; -+ -+ GC_start_blocking(); -+ result = REAL_FUNC(nanosleep)(rqtp, rmtp); -+ GC_end_blocking(); -+ -+ return result; -+} -+ - /* A wrapper for the standard C sleep function */ - int WRAP_FUNC(sleep) (unsigned int seconds) - { -$NetBSD: patch-be,v 1.1 2007/08/03 07:46:54 taca Exp $ - ---- mono-1.1.13.8.1/support/sys-mman.corig 2006-04-11 07:21:37.000000000 +0900 -+++ support/sys-mman.c 2007-08-03 22:04:18.000000000 +0900 -@@ -96,8 +96,13 @@ - if (Mono_Posix_FromMremapFlags (flags, &_flags) == -1) - return MAP_FAILED; - -+#if defined(__NetBSD__) -+ return mremap (old_address, (size_t) old_size, old_address, (size_t) new_size, -+ (unsigned long) _flags); -+#else - return mremap (old_address, (size_t) old_size, (size_t) new_size, - (unsigned long) _flags); -+#endif - } - #endif /* def HAVE_MREMAP */ - -$NetBSD: patch-bf,v 1.2 2008/02/13 14:16:43 kefren Exp $ ---- support/map.c.orig 2008-02-05 14:14:43.000000000 +0200 -+++ support/map.c 2008-02-05 14:16:06.000000000 +0200 -@@ -3011,13 +3011,21 @@ int Mono_Posix_ToMountFlags (guint64 x, - - int Mono_Posix_FromMremapFlags (guint64 x, guint64 *r) - { -+#ifdef __NetBSD__ -+ *r = MAP_FIXED; -+#else - *r = 0; -+#endif - if ((x & Mono_Posix_MremapFlags_MREMAP_MAYMOVE) == Mono_Posix_MremapFlags_MREMAP_MAYMOVE) -+#ifdef __NetBSD__ -+ *r &= ~MAP_FIXED; -+#else - #ifdef MREMAP_MAYMOVE - *r |= MREMAP_MAYMOVE; - #else /* def MREMAP_MAYMOVE */ - {errno = EINVAL; return -1;} - #endif /* ndef MREMAP_MAYMOVE */ -+#endif /* __NetBSD__ */ - if (x == 0) - return 0; - return 0; -$NetBSD: patch-bg,v 1.1 2008/02/13 14:16:43 kefren Exp $ ---- mono/metadata/socket-io.c.orig 2008-02-07 08:37:02.000000000 +0200 -+++ mono/metadata/socket-io.c 2008-02-07 08:37:17.000000000 +0200 -@@ -2751,7 +2751,7 @@ - struct sockaddr_in6 saddr6; - struct addrinfo *info = NULL, hints; - gint32 family; -- char hostname[1024] = {0}; -+ char hostname[NI_MAXHOST] = {0}; - int flags = 0; - #else - struct in_addr inaddr; -$NetBSD: patch-bh,v 1.1 2008/02/13 14:16:43 kefren Exp $ ---- mcs/class/Managed.Windows.Forms/build-csproj.orig 2008-02-07 08:44:48.000000000 +0200 -+++ mcs/class/Managed.Windows.Forms/build-csproj 2008-02-07 08:44:59.000000000 +0200 -@@ -177,7 +177,7 @@ - { - cat $Resource | while read SRC; do - SRC=`echo $SRC | $tr '/' '\\\\'` --SRC=`echo $SRC | sed 's/-resource://' | gawk -F , '{print " RelPath = \"" $1 "\"\n CustomToolNameSpace = \"" $2 "\""}' | fgrep -v \"\"` -+SRC=`echo $SRC | sed 's/-resource://' | awk -F , '{print " RelPath = \"" $1 "\"\n CustomToolNameSpace = \"" $2 "\""}' | fgrep -v \"\"` - - cat << EOT - - #include - #include --#include --#include --#include --#include --#include --#include --#include -+#include - - #include "prefs.h" - #include "prefs_ui.h" ---- src/prefs_summary_column.c.orig 2008-10-08 20:04:41.000000000 +0200 -+++ src/prefs_summary_column.c 2008-10-08 20:04:53.000000000 +0200 -@@ -26,13 +26,7 @@ - #include - #include - #include --#include --#include --#include --#include --#include --#include --#include -+#include - - #include "prefs.h" - #include "prefs_ui.h" ---- src/addr_compl.c.orig 2008-10-08 20:05:25.000000000 +0200 -+++ src/addr_compl.c 2008-10-08 20:05:37.000000000 +0200 -@@ -26,12 +26,7 @@ - #include - #include - #include --#include --#include --#include --#include --#include --#include -+#include - - #include - #include ---- src/editgroup.c.orig 2008-10-08 20:06:05.000000000 +0200 -+++ src/editgroup.c 2008-10-08 20:06:17.000000000 +0200 -@@ -26,13 +26,7 @@ - #include - #include - #include --#include --#include --#include --#include --#include --#include --#include -+#include - - #include "addressbook.h" - #include "addressitem.h" diff --git a/templates/sysklogd/install.diff b/templates/sysklogd/patches/fix_installation.diff similarity index 100% rename from templates/sysklogd/install.diff rename to templates/sysklogd/patches/fix_installation.diff diff --git a/templates/tcp_wrappers/build.diff b/templates/tcp_wrappers/patches/fix_build_scaffold.c.diff similarity index 100% rename from templates/tcp_wrappers/build.diff rename to templates/tcp_wrappers/patches/fix_build_scaffold.c.diff diff --git a/templates/tcp_wrappers/shared_lib_plus_plus-1.diff b/templates/tcp_wrappers/patches/shared_lib_plus_plus-1.diff similarity index 100% rename from templates/tcp_wrappers/shared_lib_plus_plus-1.diff rename to templates/tcp_wrappers/patches/shared_lib_plus_plus-1.diff diff --git a/templates/tzdata/build.diff b/templates/tzdata/patches/fix_Makefile.diff similarity index 100% rename from templates/tzdata/build.diff rename to templates/tzdata/patches/fix_Makefile.diff diff --git a/templates/unzip/install.diff b/templates/unzip/patches/fix_Makefile.diff similarity index 100% rename from templates/unzip/install.diff rename to templates/unzip/patches/fix_Makefile.diff diff --git a/templates/unzip/build.diff b/templates/unzip/patches/unzipsfx_no_libz.diff similarity index 100% rename from templates/unzip/build.diff rename to templates/unzip/patches/unzipsfx_no_libz.diff diff --git a/templates/util-linux-ng/patch-build-blkid-uuid-utils.diff b/templates/util-linux-ng/patches/build_blkid_uuid_utils.diff similarity index 100% rename from templates/util-linux-ng/patch-build-blkid-uuid-utils.diff rename to templates/util-linux-ng/patches/build_blkid_uuid_utils.diff diff --git a/templates/util-linux-ng/template b/templates/util-linux-ng/template index 3d42fd00841..622432a9ee7 100644 --- a/templates/util-linux-ng/template +++ b/templates/util-linux-ng/template @@ -1,7 +1,6 @@ # Template file for 'util-linux-ng' pkgname=util-linux-ng version=2.16.1 -patch_files="patch-build-blkid-uuid-utils.diff" distfiles="${KERNEL_SITE}/utils/$pkgname/v2.16/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-partx --enable-write --disable-libuuid diff --git a/templates/xf86-input-calcomp/build.diff b/templates/xf86-input-calcomp/patches/fix_build.diff similarity index 100% rename from templates/xf86-input-calcomp/build.diff rename to templates/xf86-input-calcomp/patches/fix_build.diff diff --git a/templates/xf86-input-citron/build.diff b/templates/xf86-input-citron/patches/fix_build.diff similarity index 100% rename from templates/xf86-input-citron/build.diff rename to templates/xf86-input-citron/patches/fix_build.diff diff --git a/templates/xf86-input-dmc/build.diff b/templates/xf86-input-dmc/patches/fix_build.diff similarity index 100% rename from templates/xf86-input-dmc/build.diff rename to templates/xf86-input-dmc/patches/fix_build.diff diff --git a/templates/xf86-input-dynapro/build.diff b/templates/xf86-input-dynapro/patches/fix_build.diff similarity index 100% rename from templates/xf86-input-dynapro/build.diff rename to templates/xf86-input-dynapro/patches/fix_build.diff diff --git a/templates/xf86-input-elo2300/build.diff b/templates/xf86-input-elo2300/patches/fix_build.diff similarity index 100% rename from templates/xf86-input-elo2300/build.diff rename to templates/xf86-input-elo2300/patches/fix_build.diff diff --git a/templates/xf86-input-magellan/build.diff b/templates/xf86-input-magellan/patches/fix_build.diff similarity index 100% rename from templates/xf86-input-magellan/build.diff rename to templates/xf86-input-magellan/patches/fix_build.diff diff --git a/templates/xf86-input-microtouch/build.diff b/templates/xf86-input-microtouch/patches/fix_build.diff similarity index 100% rename from templates/xf86-input-microtouch/build.diff rename to templates/xf86-input-microtouch/patches/fix_build.diff diff --git a/templates/xf86-input-palmax/build.diff b/templates/xf86-input-palmax/patches/fix_build.diff similarity index 100% rename from templates/xf86-input-palmax/build.diff rename to templates/xf86-input-palmax/patches/fix_build.diff diff --git a/templates/xf86-input-spaceorb/build.diff b/templates/xf86-input-spaceorb/patches/fix_build.diff similarity index 100% rename from templates/xf86-input-spaceorb/build.diff rename to templates/xf86-input-spaceorb/patches/fix_build.diff diff --git a/templates/xf86-input-tek4957/build.diff b/templates/xf86-input-tek4957/patches/fix_build.diff similarity index 100% rename from templates/xf86-input-tek4957/build.diff rename to templates/xf86-input-tek4957/patches/fix_build.diff diff --git a/templates/zip/install.diff b/templates/zip/patches/fix_install.diff similarity index 100% rename from templates/zip/install.diff rename to templates/zip/patches/fix_install.diff diff --git a/templates/zlib/build.diff b/templates/zlib/patches/configure_build_all_libs.diff similarity index 100% rename from templates/zlib/build.diff rename to templates/zlib/patches/configure_build_all_libs.diff