Date: Tue, 24 Jul 2001 20:22:01 -0500 (CDT) From: Jeremy Norris <ishmael27@home.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/29206: Update port graphics/gliv Message-ID: <200107250122.f6P1M1Q85787@babylon.merseine.nu>
next in thread | raw e-mail | index | archive | help
>Number: 29206 >Category: ports >Synopsis: Update port graphics/gliv >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jul 24 18:20:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Jeremy Norris >Release: FreeBSD 4.3-STABLE i386 >Organization: none >Environment: System: FreeBSD babylon.merseine.nu 4.3-STABLE FreeBSD 4.3-STABLE #0: Wed Jul 4 21:41:47 CDT 2001 ishmael@babylon.merseine.nu:/usr/obj/usr/src/sys/BABYLON i386 >Description: Update port graphics/gliv to latest version, 1.1.3. >How-To-Repeat: All patches are obsolete, be sure to cvs rm them as well. >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gliv/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 2001/06/17 18:09:38 1.4 +++ Makefile 2001/07/24 12:57:40 @@ -6,24 +6,28 @@ # PORTNAME= gliv -PORTVERSION= 1.0.3 +PORTVERSION= 1.1.3 CATEGORIES= graphics MASTER_SITES= http://gliv.tuxfamily.org/ MAINTAINER= ishmael27@home.com LIB_DEPENDS= Imlib2.1:${PORTSDIR}/graphics/imlib2 \ + gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt USE_BZIP2= yes USE_GMAKE= yes -USE_MESA= yes -GNU_CONFIGURE= yes +USE_GTK= yes USE_X_PREFIX= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-lm" \ - LIBS="-L${LOCALBASE}/lib -lgnugetopt" +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/include -lgnugetopt -L${X11BASE}/lib \ + -lGLU -lGL -lXext -lX11 -lm ${PTHREAD_LIBS}" MAN1= gliv.1 + +post-patch: + @${PERL} -pi -e 's|gtk-config|${GTK_CONFIG}|g' ${WRKSRC}/configure .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/graphics/gliv/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 2001/06/17 18:09:38 1.3 +++ distinfo 2001/07/24 12:57:46 @@ -1 +1 @@ -MD5 (gliv-1.0.3.tar.bz2) = 52cb042fa6453304a616fa9737aaa61f +MD5 (gliv-1.1.3.tar.bz2) = 7a24a098dbd0659648fd43406128657e Index: files/patch-cmdline.c =================================================================== RCS file: patch-cmdline.c diff -N patch-cmdline.c --- /tmp/cvsbPZimT9MEi Tue Jul 24 08:01:37 2001 +++ /dev/null Tue Jul 24 08:00:14 2001 @@ -1,45 +0,0 @@ ---- cmdline.c.orig Fri Jun 8 10:59:27 2001 -+++ cmdline.c Wed Jun 13 19:41:21 2001 -@@ -44,7 +44,6 @@ - -s --shuffle Show images in random order (default=off)\n\ - -l --load-requested Load only when requested (default=off)\n\ - -v --verbose Verbose mode (default=off)\n\ -- -R --recursive Process directories recursively (default=off)\n\ - -i --info Show infos about displayed image (default=off)\n\ - -m --maximize Maximize image to fit screen (default=off)\n\ - -dINT --delay=INT Delay before hiding the cursor\n\ -@@ -80,7 +79,6 @@ - args_info->shuffle_given = 0 ; - args_info->load_requested_given = 0 ; - args_info->verbose_given = 0 ; -- args_info->recursive_given = 0 ; - args_info->info_given = 0 ; - args_info->maximize_given = 0 ; - args_info->delay_given = 0 ; -@@ -89,7 +87,6 @@ - args_info->shuffle_flag = 0;\ - args_info->load_requested_flag = 0;\ - args_info->verbose_flag = 0;\ -- args_info->recursive_flag = 0;\ - args_info->info_flag = 0;\ - args_info->maximize_flag = 0;\ - } -@@ -109,7 +106,6 @@ - { "shuffle", 0, NULL, 's' }, - { "load-requested", 0, NULL, 'l' }, - { "verbose", 0, NULL, 'v' }, -- { "recursive", 0, NULL, 'R' }, - { "info", 0, NULL, 'i' }, - { "maximize", 0, NULL, 'm' }, - { "delay", 1, NULL, 'd' }, -@@ -146,10 +142,6 @@ - - case 'v': /* Verbose mode. */ - args_info->verbose_flag = !(args_info->verbose_flag); -- break; -- -- case 'R': /* Process directories recursively. */ -- args_info->recursive_flag = !(args_info->recursive_flag); - break; - - case 'i': /* Show infos about displayed image. */ Index: files/patch-cmdline.h =================================================================== RCS file: patch-cmdline.h diff -N patch-cmdline.h --- /tmp/cvsiwP7tDf4Lr Tue Jul 24 08:01:37 2001 +++ /dev/null Tue Jul 24 08:00:14 2001 @@ -1,18 +0,0 @@ ---- cmdline.h.orig Fri Jun 8 10:59:27 2001 -+++ cmdline.h Wed Jun 13 19:53:13 2001 -@@ -24,7 +24,6 @@ - int shuffle_flag; /* Show images in random order (default=off). */ - int load_requested_flag; /* Load only when requested (default=off). */ - int verbose_flag; /* Verbose mode (default=off). */ -- int recursive_flag; /* Process directories recursively (default=off). */ - int info_flag; /* Show infos about displayed image (default=off). */ - int maximize_flag; /* Maximize image to fit screen (default=off). */ - int delay_arg; /* Delay before hiding the cursor. */ -@@ -35,7 +34,6 @@ - int shuffle_given ; /* Whether shuffle was given. */ - int load_requested_given ; /* Whether load-requested was given. */ - int verbose_given ; /* Whether verbose was given. */ -- int recursive_given ; /* Whether recursive was given. */ - int info_given ; /* Whether info was given. */ - int maximize_given ; /* Whether maximize was given. */ - int delay_given ; /* Whether delay was given. */ Index: files/patch-gliv.1 =================================================================== RCS file: patch-gliv.1 diff -N patch-gliv.1 --- /tmp/cvsuOZZOqKfTp Tue Jul 24 08:01:37 2001 +++ /dev/null Tue Jul 24 08:00:14 2001 @@ -1,12 +0,0 @@ ---- gliv.1.orig Fri Jun 8 17:17:03 2001 -+++ gliv.1 Wed Jun 13 19:45:13 2001 -@@ -29,9 +29,6 @@ - \fB\-v, \-\-verbose\fR - Print some information (default=off). Use it to know more about your hardware and to see \fIgliv\fR loading and unloading images. - .TP --\fB\-R, \-\-recursive\fR --Processe directories recursively (default=off). If you specify a directory in the command line \fIgliv\fR will open every image in this directory and its subdirectories. --.TP - \fB\-i, \-\-info\fR - Show infos about displayed image (default=off). With this option, \fIgliv\fR will by default print the info lines you can obtain by typing 'i'. - .TP Index: files/patch-gliv.c =================================================================== RCS file: patch-gliv.c diff -N patch-gliv.c --- /tmp/cvsRZ8kA2eOCd Tue Jul 24 08:01:37 2001 +++ /dev/null Tue Jul 24 08:00:14 2001 @@ -1,54 +0,0 @@ ---- gliv.c.orig Tue Jun 12 14:40:17 2001 -+++ gliv.c Wed Jun 13 19:42:54 2001 -@@ -120,37 +120,6 @@ - } - - /*************************************** -- * Adds a filename to the list. This * -- *function is only used by ftw when the* -- * -R flag is given. * -- ***************************************/ --static int add_to_list(const char *file, const struct stat *st, int flag) --{ -- if (flag == FTW_F) { -- /* It is not a directory, we don't care if it is an image or not. */ -- total++; -- names = realloc(names, total * sizeof(char *)); -- names[total - 1] = strdup(file); -- } -- return 0; --} -- --/*************************************** -- * Recursively adds all files to the * -- * list by descending directories. The * -- * image list is the variable 'names'. * -- ***************************************/ --static void build_image_list(char **array, unsigned int nb) --{ -- unsigned int i; -- -- for (i = 0; i < nb; i++) { -- ftw(array[i], add_to_list, 8); -- free(array[i]); -- } --} -- --/*************************************** - * Sets global variables according * - * to command-line arguments. * - ***************************************/ -@@ -166,13 +135,8 @@ - rt.info = args->info_flag; - rt.maximize = args->maximize_flag; - -- if (args->recursive_flag) { -- build_image_list(args->inputs, args->inputs_num); -- free(args->inputs); -- } else { - total = args->inputs_num; - names = args->inputs; -- } - - if (total < 2) - /* Don't use a thread for only one image. */ Index: files/patch-gliv.ggo =================================================================== RCS file: patch-gliv.ggo diff -N patch-gliv.ggo --- /tmp/cvsplA2TVPM9t Tue Jul 24 08:01:37 2001 +++ /dev/null Tue Jul 24 08:00:14 2001 @@ -1,10 +0,0 @@ ---- gliv.ggo.orig Fri Jun 8 10:59:27 2001 -+++ gliv.ggo Wed Jun 13 19:46:09 2001 -@@ -2,7 +2,6 @@ - option "shuffle" s "Show images in random order" flag off - option "load-requested" l "Load only when requested" flag off - option "verbose" v "Verbose mode" flag off --option "recursive" R "Process directories recursively" flag off - option "info" i "Show infos about displayed image" flag off - option "maximize" m "Maximize image to fit screen" flag off - option "delay" d "Delay before hiding the cursor" int no Index: files/patch-gliv.h =================================================================== RCS file: patch-gliv.h diff -N patch-gliv.h --- /tmp/cvsO6r1P9hlnN Tue Jul 24 08:01:37 2001 +++ /dev/null Tue Jul 24 08:00:14 2001 @@ -1,10 +0,0 @@ ---- gliv.h.orig Sun Jun 10 13:46:58 2001 -+++ gliv.h Wed Jun 13 19:42:26 2001 -@@ -11,7 +11,6 @@ - #include <unistd.h> - #include <pthread.h> - #include <signal.h> --#include <ftw.h> - #include "cmdline.h" - - /*************************************** >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107250122.f6P1M1Q85787>