pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Make it build on DragonFly.
details: https://anonhg.NetBSD.org/pkgsrc/rev/bee9f3a0b7b0
branches: trunk
changeset: 552065:bee9f3a0b7b0
user: hasso <hasso%pkgsrc.org@localhost>
date: Thu Dec 25 05:33:20 2008 +0000
description:
Make it build on DragonFly.
diffstat:
net/gnome-nettool/distinfo | 8 ++--
net/gnome-nettool/patches/patch-aa | 4 +-
net/gnome-nettool/patches/patch-ab | 4 +-
net/gnome-nettool/patches/patch-ac | 18 ++++++------
sysutils/gnome-mount/distinfo | 6 ++--
sysutils/gnome-mount/patches/patch-aa | 52 +++++++++++++++++++++++++---------
sysutils/gnome-mount/patches/patch-ab | 36 ++++++++++++-----------
7 files changed, 77 insertions(+), 51 deletions(-)
diffs (truncated from 385 to 300 lines):
diff -r c62d869aca97 -r bee9f3a0b7b0 net/gnome-nettool/distinfo
--- a/net/gnome-nettool/distinfo Thu Dec 25 01:28:15 2008 +0000
+++ b/net/gnome-nettool/distinfo Thu Dec 25 05:33:20 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/12/02 20:56:49 wiz Exp $
+$NetBSD: distinfo,v 1.2 2008/12/25 05:35:50 hasso Exp $
SHA1 (gnome-nettool-2.22.1.tar.bz2) = 41e66c37beb677cf5ac17a2ec6254cd24b0e18d4
RMD160 (gnome-nettool-2.22.1.tar.bz2) = 43b78d53ae5805f97f031821b37b7e739ca5866a
Size (gnome-nettool-2.22.1.tar.bz2) = 600085 bytes
-SHA1 (patch-aa) = 3f6c5cea284b2ddfefda9cff1e74f6fa5755bb8d
-SHA1 (patch-ab) = 3c45a604945c955ea18dc510b279e7e9405d0b1a
-SHA1 (patch-ac) = 647ecaae91966d99759b08c920af9eaf8e1fe6ca
+SHA1 (patch-aa) = 587c1c7d011d5d8a4feafc63a7a505979296a8a1
+SHA1 (patch-ab) = 8d89efa54803da97d962e43990728f56e60a5ab2
+SHA1 (patch-ac) = b4ec8fb2cbaa799717b11dc9d9036a7bac1a9e51
diff -r c62d869aca97 -r bee9f3a0b7b0 net/gnome-nettool/patches/patch-aa
--- a/net/gnome-nettool/patches/patch-aa Thu Dec 25 01:28:15 2008 +0000
+++ b/net/gnome-nettool/patches/patch-aa Thu Dec 25 05:33:20 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/12/02 20:56:49 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2008/12/25 05:35:50 hasso Exp $
--- src/ping.h.orig 2008-09-22 22:04:12.000000000 +0000
+++ src/ping.h
@@ -7,7 +7,7 @@
# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
# define PING_PARAMS_6
-#elif defined(__OSF__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__OSF__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__OSF__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
# define PING_PROGRAM_FORMAT "%s ping -c %d -n %s"
# define PING_PROGRAM_FORMAT_6 "%s ping6 -c %d -n %s"
# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
diff -r c62d869aca97 -r bee9f3a0b7b0 net/gnome-nettool/patches/patch-ab
--- a/net/gnome-nettool/patches/patch-ab Thu Dec 25 01:28:15 2008 +0000
+++ b/net/gnome-nettool/patches/patch-ab Thu Dec 25 05:33:20 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/12/02 20:56:49 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2008/12/25 05:35:50 hasso Exp $
--- src/netstat.h.orig 2008-09-22 22:04:12.000000000 +0000
+++ src/netstat.h
@@ -7,7 +7,7 @@
# define NETSTAT_MULTICAST_FORMAT "%s %d %s"
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
# define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"
# define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"
# define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"
diff -r c62d869aca97 -r bee9f3a0b7b0 net/gnome-nettool/patches/patch-ac
--- a/net/gnome-nettool/patches/patch-ac Thu Dec 25 01:28:15 2008 +0000
+++ b/net/gnome-nettool/patches/patch-ac Thu Dec 25 05:33:20 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/12/02 20:56:49 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2008/12/25 05:35:50 hasso Exp $
--- src/netstat.c.orig 2008-09-22 22:04:12.000000000 +0000
+++ src/netstat.c
@@ -7,7 +7,7 @@
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->protocol))) {
/* Only works for Solaris */
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
option = g_strdup ("-a -f inet -ln");
#else
if (netinfo_is_ipv6_enable ()) {
@@ -16,7 +16,7 @@
count = strip_protocol_line (line, &data);
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
if (count == 5 || count == 6 || count == 9 || count == 10) {
#else
if (count == 5 || count == 6) {
@@ -25,7 +25,7 @@
{
gint count = 0;
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
gint a1, a2, a3, a4;
gchar s9[30];
#else
@@ -34,7 +34,7 @@
/*line = g_strdelimit (line, ":", ' ');*/
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
line = g_strdelimit (line, ":", ' ');
count = sscanf (line, NETSTAT_PROTOCOL_FORMAT,
@@ -43,7 +43,7 @@
count = strip_route_line (line, &data);
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
if (count == 6) {
#else
if ((count == 8) || (count == 7)) {
@@ -52,7 +52,7 @@
#endif
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
count = sscanf (line, NETSTAT_ROUTE_FORMAT,
data->destination,
data->gateway, flags,
@@ -61,7 +61,7 @@
column =
gtk_tree_view_column_new_with_attributes
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
(_("Destination/Prefix"), renderer, "text", 0, NULL);
#else
(_("Destination"), renderer, "text", 0, NULL);
@@ -70,7 +70,7 @@
gtk_tree_view_append_column (widget, column);
-#if ! (defined(__FreeBSD__) || defined(__OpenBSD__))
-+#if ! (defined(__FreeBSD__) || defined(__OpenBSD__)) || defined(__NetBSD__)
++#if ! (defined(__FreeBSD__) || defined(__OpenBSD__)) || defined(__NetBSD__) || defined(__DragonFly__)
renderer = gtk_cell_renderer_text_new ();
column =
gtk_tree_view_column_new_with_attributes
diff -r c62d869aca97 -r bee9f3a0b7b0 sysutils/gnome-mount/distinfo
--- a/sysutils/gnome-mount/distinfo Thu Dec 25 01:28:15 2008 +0000
+++ b/sysutils/gnome-mount/distinfo Thu Dec 25 05:33:20 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2008/12/25 05:33:20 hasso Exp $
SHA1 (gnome-mount-0.8.tar.gz) = 846ba178cf9009f3e32c7f55f912b3ca6b9ecedb
RMD160 (gnome-mount-0.8.tar.gz) = 003800eda3edb7747714b1002bd1a1b50ea44fe9
Size (gnome-mount-0.8.tar.gz) = 505788 bytes
-SHA1 (patch-aa) = f80152c75eef7963dff5ec557d8ff26fd3242b4c
-SHA1 (patch-ab) = c3f771562e599ddfd7abd15466995d78172704f4
+SHA1 (patch-aa) = 31479b417cf7c645cef6f3539aa49576d5104795
+SHA1 (patch-ab) = d2f85ebb00a5a11e7b60d94b6fbd7b7e695185c8
SHA1 (patch-ac) = 026448555bd9710cda343b6573260e3dcaa28b20
diff -r c62d869aca97 -r bee9f3a0b7b0 sysutils/gnome-mount/patches/patch-aa
--- a/sysutils/gnome-mount/patches/patch-aa Thu Dec 25 01:28:15 2008 +0000
+++ b/sysutils/gnome-mount/patches/patch-aa Thu Dec 25 05:33:20 2008 +0000
@@ -1,20 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2008/12/25 05:33:20 hasso Exp $
---- src/gnome-mount-properties-view.c.orig 2008-02-25 16:55:05.000000000 -0500
-+++ src/gnome-mount-properties-view.c
+--- src/gnome-mount-properties-view.c.orig 2008-02-25 23:55:05 +0200
++++ src/gnome-mount-properties-view.c 2008-12-24 22:38:36 +0200
@@ -35,7 +35,7 @@
#include <string.h>
#include <gconf/gconf-client.h>
-#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <fstab.h>
#include <sys/param.h>
#include <sys/ucred.h>
-@@ -59,6 +59,30 @@ struct _GnomeMountPropertiesViewClass {
+@@ -59,7 +59,31 @@ struct _GnomeMountPropertiesViewClass {
GtkVBoxClass base_class;
};
+-#ifdef __FreeBSD__
+#ifdef __NetBSD__
+static struct opt {
+ int o_opt;
@@ -39,10 +40,33 @@
+ { 0, NULL }
+};
+#endif
- #ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
static struct opt {
int o_opt;
-@@ -345,6 +369,14 @@ struct mtab_handle
+ const char *o_name;
+@@ -79,8 +103,12 @@ static struct opt {
+ { MNT_NOCLUSTERW, "noclusterw" },
+ { MNT_SUIDDIR, "suiddir" },
+ { MNT_SOFTDEP, "soft-updates" },
++#ifdef MNT_MULTILABEL
+ { MNT_MULTILABEL, "multilabel" },
++#endif
++#ifdef MNT_ACLS
+ { MNT_ACLS, "acls" },
++#endif
+ #ifdef MNT_GJOURNAL
+ { MNT_GJOURNAL, "gjournal" },
+ #endif
+@@ -337,7 +365,7 @@ populate_ui_from_gconf (GnomeMountProper
+ g_object_unref (gconf_client);
+ }
+
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ struct mtab_handle
+ {
+ struct statfs *mounts;
+@@ -345,6 +373,14 @@ struct mtab_handle
int iter;
};
#endif
@@ -57,25 +81,25 @@
/* borrowed from gtk/gtkfilesystemunix.c in GTK+ on 02/23/2006 */
static void
-@@ -454,7 +486,7 @@ out:
+@@ -454,7 +490,7 @@ out:
static gboolean
mtab_open (gpointer *handle)
{
-#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
struct mtab_handle *mtab;
mtab = g_new0 (struct mtab_handle, 1);
-@@ -475,7 +507,7 @@ mtab_open (gpointer *handle)
+@@ -475,7 +511,7 @@ mtab_open (gpointer *handle)
static gboolean
mtab_next (gpointer handle, char **device_file, char **mount_options, char **mount_fstype)
{
-#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
struct mtab_handle *mtab = handle;
if (mtab->iter < mtab->n_mounts) {
-@@ -484,7 +516,11 @@ mtab_next (gpointer handle, char **devic
+@@ -484,7 +520,11 @@ mtab_next (gpointer handle, char **devic
GString *optstr;
optstr = g_string_new("");
@@ -87,12 +111,12 @@
for (o = optnames; flags && o->o_opt; o++) {
if (flags & o->o_opt) {
-@@ -517,7 +553,7 @@ mtab_next (gpointer handle, char **devic
+@@ -517,7 +557,7 @@ mtab_next (gpointer handle, char **devic
static void
mtab_close (gpointer handle)
{
-#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
g_free (handle);
#else
fclose (handle);
diff -r c62d869aca97 -r bee9f3a0b7b0 sysutils/gnome-mount/patches/patch-ab
--- a/sysutils/gnome-mount/patches/patch-ab Thu Dec 25 01:28:15 2008 +0000
+++ b/sysutils/gnome-mount/patches/patch-ab Thu Dec 25 05:33:20 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/11/22 17:54:42 jmcneill Exp $
+$NetBSD: patch-ab,v 1.2 2008/12/25 05:33:20 hasso Exp $
---- src/gnome-mount.c.orig 2008-04-16 19:41:32.000000000 -0400
-+++ src/gnome-mount.c
+--- src/gnome-mount.c.orig 2008-04-17 02:41:32 +0300
++++ src/gnome-mount.c 2008-12-24 22:39:47 +0200
@@ -31,6 +31,10 @@
#include <string.h>
#include <stdlib.h>
@@ -18,23 +18,25 @@
#endif
-#if !defined(sun) && !defined(__FreeBSD__)
-+#if !defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
#include <mntent.h>
-#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <fstab.h>
#include <sys/param.h>
#include <sys/ucred.h>
-@@ -677,7 +681,7 @@ static char *
+@@ -677,15 +681,19 @@ static char *
get_mntent_mount_point(const char *device_file)
{
char *mount_point;
-#if! defined(sun) && !defined(__FreeBSD__)
-+#if! defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if! defined(sun) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
FILE *f;
struct mntent mnt;
struct mntent *mnte;
-@@ -686,6 +690,10 @@ get_mntent_mount_point(const char *devic
+ char buf[512];
Home |
Main Index |
Thread Index |
Old Index