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
This commit is contained in:
Juan RP
parent
cc5ccaed3d
commit
85a7ceb76f
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
-Np1
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
<File
|
||||
$NetBSD: patch-bi,v 1.1 2008/02/13 14:16:43 kefren Exp $
|
||||
--- mono/metadata/filewatcher.c.orig 2008-02-07 08:47:39.000000000 +0200
|
||||
+++ mono/metadata/filewatcher.c 2008-02-07 08:52:21.000000000 +0200
|
||||
@@ -44,9 +44,6 @@
|
||||
gint
|
||||
ves_icall_System_IO_FSW_SupportsFSW (void)
|
||||
{
|
||||
-#if HAVE_KQUEUE
|
||||
- return 3;
|
||||
-#else
|
||||
MonoDl *fam_module;
|
||||
int lib_used = 4; /* gamin */
|
||||
int inotify_instance;
|
||||
@@ -70,15 +67,22 @@
|
||||
}
|
||||
|
||||
if (fam_module == NULL)
|
||||
+#if HAVE_KQUEUE
|
||||
+ return 3;
|
||||
+#else
|
||||
return 0;
|
||||
+#endif
|
||||
|
||||
err = mono_dl_symbol (fam_module, "FAMNextEvent", (gpointer *) &FAMNextEvent);
|
||||
g_free (err);
|
||||
if (FAMNextEvent == NULL)
|
||||
+#if HAVE_KQUEUE
|
||||
+ return 3;
|
||||
+#else
|
||||
return 0;
|
||||
+#endif
|
||||
|
||||
return lib_used;
|
||||
-#endif
|
||||
}
|
||||
|
||||
/* Almost copied from fam.h. Weird, I know */
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
--- src/prefs_display_items.c.orig 2008-10-08 20:02:35.000000000 +0200
|
||||
+++ src/prefs_display_items.c 2008-10-08 20:03:54.000000000 +0200
|
||||
@@ -26,13 +26,7 @@
|
||||
#include <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
-#include <gtk/gtkmain.h>
|
||||
-#include <gtk/gtkwindow.h>
|
||||
-#include <gtk/gtkvbox.h>
|
||||
-#include <gtk/gtkhbox.h>
|
||||
-#include <gtk/gtkclist.h>
|
||||
-#include <gtk/gtkbutton.h>
|
||||
-#include <gtk/gtkstock.h>
|
||||
+#include <gtk/gtk.h>
|
||||
|
||||
#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 <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
-#include <gtk/gtkmain.h>
|
||||
-#include <gtk/gtkwindow.h>
|
||||
-#include <gtk/gtkvbox.h>
|
||||
-#include <gtk/gtkhbox.h>
|
||||
-#include <gtk/gtkclist.h>
|
||||
-#include <gtk/gtkbutton.h>
|
||||
-#include <gtk/gtkstock.h>
|
||||
+#include <gtk/gtk.h>
|
||||
|
||||
#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 <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
-#include <gtk/gtkmain.h>
|
||||
-#include <gtk/gtkwindow.h>
|
||||
-#include <gtk/gtkentry.h>
|
||||
-#include <gtk/gtkeditable.h>
|
||||
-#include <gtk/gtkclist.h>
|
||||
-#include <gtk/gtkscrolledwindow.h>
|
||||
+#include <gtk/gtk.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
--- 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 <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
-#include <gtk/gtkwindow.h>
|
||||
-#include <gtk/gtkclist.h>
|
||||
-#include <gtk/gtkvbox.h>
|
||||
-#include <gtk/gtkstatusbar.h>
|
||||
-#include <gtk/gtktable.h>
|
||||
-#include <gtk/gtkentry.h>
|
||||
-#include <gtk/gtkstock.h>
|
||||
+#include <gtk/gtk.h>
|
||||
|
||||
#include "addressbook.h"
|
||||
#include "addressitem.h"
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue