diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-12-30 08:50:58 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-12-30 08:50:58 +0000 |
commit | d194ee235363abe88a27e386b89426982ed43cd6 (patch) | |
tree | 625a12c7d1d667f27cc9271c101c08176a9c4c83 /graphics/gliv | |
parent | Update to version 1.1 (diff) |
Update to version 1.9
PR: ports/75624
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=125513
Diffstat (limited to 'graphics/gliv')
-rw-r--r-- | graphics/gliv/Makefile | 4 | ||||
-rw-r--r-- | graphics/gliv/distinfo | 4 | ||||
-rw-r--r-- | graphics/gliv/files/patch-Makefile.in | 8 | ||||
-rw-r--r-- | graphics/gliv/files/patch-src::collection.c | 22 | ||||
-rw-r--r-- | graphics/gliv/files/patch-src::options.c | 38 | ||||
-rw-r--r-- | graphics/gliv/pkg-plist | 6 |
6 files changed, 59 insertions, 23 deletions
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile index 08bd79144346..09151a7bc8dd 100644 --- a/graphics/gliv/Makefile +++ b/graphics/gliv/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gliv -PORTVERSION= 1.8.4 -PORTREVISION= 1 +PORTVERSION= 1.9 CATEGORIES= graphics MASTER_SITES= http://guichaz.free.fr/gliv/ @@ -28,6 +27,7 @@ MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" MAN1= gliv.1 +MANLANG= "" de fr ru CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib diff --git a/graphics/gliv/distinfo b/graphics/gliv/distinfo index 71f9548009ae..2b2c1ceb7185 100644 --- a/graphics/gliv/distinfo +++ b/graphics/gliv/distinfo @@ -1,2 +1,2 @@ -MD5 (gliv-1.8.4.tar.bz2) = 2ad963118f2f373e6b53f8cb247a9dcc -SIZE (gliv-1.8.4.tar.bz2) = 428207 +MD5 (gliv-1.9.tar.bz2) = c4bd472e05c1c12f9feffb4a117fc62c +SIZE (gliv-1.9.tar.bz2) = 445846 diff --git a/graphics/gliv/files/patch-Makefile.in b/graphics/gliv/files/patch-Makefile.in index ea0162db87d2..db0f202eb1d7 100644 --- a/graphics/gliv/files/patch-Makefile.in +++ b/graphics/gliv/files/patch-Makefile.in @@ -1,9 +1,9 @@ ---- Makefile.in.orig Thu Feb 5 07:32:28 2004 -+++ Makefile.in Sat Feb 7 17:42:40 2004 -@@ -622,8 +622,6 @@ +--- Makefile.in.orig Mon Dec 20 03:20:43 2004 ++++ Makefile.in Sat Dec 25 23:00:57 2004 +@@ -582,8 +582,6 @@ info-am: - install-data-am: install-man + install-data-am: - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook diff --git a/graphics/gliv/files/patch-src::collection.c b/graphics/gliv/files/patch-src::collection.c index 1f046e57c2ce..00b8afd23221 100644 --- a/graphics/gliv/files/patch-src::collection.c +++ b/graphics/gliv/files/patch-src::collection.c @@ -1,14 +1,6 @@ ---- src/collection.c.orig Thu Jul 29 06:40:56 2004 -+++ src/collection.c Thu Sep 30 20:46:04 2004 -@@ -77,6 +77,7 @@ - * are '\0' terminated strings representing decimal numbers. - */ - -+#include <sys/types.h> - #include <sys/mman.h> /* mmap(), PROT_READ, MAP_PRIVATE, ... */ - #include <stdio.h> /* FILE, fopen(), fread(), fwrite(), ... */ - #include <string.h> /* strlen(), strrchr() */ -@@ -638,8 +639,8 @@ +--- src/collection.c.orig Mon Dec 20 08:16:25 2004 ++++ src/collection.c Sat Dec 25 23:01:11 2004 +@@ -713,8 +713,8 @@ guchar *base; guchar *ptr; guchar *end; @@ -19,7 +11,7 @@ }; static void free_buffer(struct coll_src *source, guchar * buffer) -@@ -655,16 +656,16 @@ +@@ -730,16 +730,16 @@ if (source->is_file) { data = g_new(guchar, length); @@ -40,7 +32,7 @@ } if (is_string && data[length - 1] != '\0') { -@@ -678,12 +679,12 @@ +@@ -753,12 +753,12 @@ static gint read_char(struct coll_src *source) { if (source->is_file) @@ -56,7 +48,7 @@ } static GdkPixbufDestroyNotify destroy_func(struct coll_src *source) -@@ -855,22 +856,22 @@ +@@ -930,22 +930,22 @@ goto no_mmap; } @@ -84,7 +76,7 @@ ok: return source; -@@ -879,7 +880,7 @@ +@@ -954,7 +954,7 @@ static void destroy_source(struct coll_src *source, gboolean ok) { if (ok == FALSE && source->is_file == FALSE) diff --git a/graphics/gliv/files/patch-src::options.c b/graphics/gliv/files/patch-src::options.c new file mode 100644 index 000000000000..742e3fe2b270 --- /dev/null +++ b/graphics/gliv/files/patch-src::options.c @@ -0,0 +1,38 @@ +--- src/options.c.orig Mon Dec 20 08:24:26 2004 ++++ src/options.c Sat Dec 25 23:10:14 2004 +@@ -199,12 +199,15 @@ + + static gboolean on_read_config_realize(GtkLabel * widget) + { +- const gchar *filename = get_read_config_file(); ++ const gchar *filename; ++ gchar *text; ++ ++ filename = get_read_config_file(); + + if (filename == NULL) + filename = _("NONE"); + +- gchar *text = ++ text = + g_strdup_printf(_("This configuration file has been read: %s"), + filename); + +@@ -216,12 +219,15 @@ + + static gboolean on_write_config_realize(GtkLabel * widget) + { +- const gchar *filename = get_write_config_file(); ++ const gchar *filename; ++ gchar *text; ++ ++ filename = get_write_config_file(); + + if (filename == NULL) + filename = _("NONE"); + +- gchar *text = ++ text = + g_strdup_printf(_("This configuration file will be written: %s"), + filename); + diff --git a/graphics/gliv/pkg-plist b/graphics/gliv/pkg-plist index ed8dd3de30a4..1db6814d0d46 100644 --- a/graphics/gliv/pkg-plist +++ b/graphics/gliv/pkg-plist @@ -8,3 +8,9 @@ share/locale/pt_BR/LC_MESSAGES/gliv.mo share/locale/ro/LC_MESSAGES/gliv.mo share/locale/ru/LC_MESSAGES/gliv.mo share/locale/sk/LC_MESSAGES/gliv.mo +@unexec rmdir %D/man/ru/man1 2>/dev/null || true +@unexec rmdir %D/man/ru 2>/dev/null || true +@unexec rmdir %D/man/fr/man1 2>/dev/null || true +@unexec rmdir %D/man/fr 2>/dev/null || true +@unexec rmdir %D/man/de/man1 2>/dev/null || true +@unexec rmdir %D/man/de 2>/dev/null || true |