head	1.10;
access;
symbols
	pkgsrc-2020Q1:1.9.0.24
	pkgsrc-2020Q1-base:1.9
	pkgsrc-2019Q4:1.9.0.46
	pkgsrc-2019Q4-base:1.9
	pkgsrc-2019Q3:1.9.0.42
	pkgsrc-2019Q3-base:1.9
	pkgsrc-2019Q2:1.9.0.40
	pkgsrc-2019Q2-base:1.9
	pkgsrc-2019Q1:1.9.0.38
	pkgsrc-2019Q1-base:1.9
	pkgsrc-2018Q4:1.9.0.36
	pkgsrc-2018Q4-base:1.9
	pkgsrc-2018Q3:1.9.0.34
	pkgsrc-2018Q3-base:1.9
	pkgsrc-2018Q2:1.9.0.32
	pkgsrc-2018Q2-base:1.9
	pkgsrc-2018Q1:1.9.0.30
	pkgsrc-2018Q1-base:1.9
	pkgsrc-2017Q4:1.9.0.28
	pkgsrc-2017Q4-base:1.9
	pkgsrc-2017Q3:1.9.0.26
	pkgsrc-2017Q3-base:1.9
	pkgsrc-2017Q2:1.9.0.22
	pkgsrc-2017Q2-base:1.9
	pkgsrc-2017Q1:1.9.0.20
	pkgsrc-2017Q1-base:1.9
	pkgsrc-2016Q4:1.9.0.18
	pkgsrc-2016Q4-base:1.9
	pkgsrc-2016Q3:1.9.0.16
	pkgsrc-2016Q3-base:1.9
	pkgsrc-2016Q2:1.9.0.14
	pkgsrc-2016Q2-base:1.9
	pkgsrc-2016Q1:1.9.0.12
	pkgsrc-2016Q1-base:1.9
	pkgsrc-2015Q4:1.9.0.10
	pkgsrc-2015Q4-base:1.9
	pkgsrc-2015Q3:1.9.0.8
	pkgsrc-2015Q3-base:1.9
	pkgsrc-2015Q2:1.9.0.6
	pkgsrc-2015Q2-base:1.9
	pkgsrc-2015Q1:1.9.0.4
	pkgsrc-2015Q1-base:1.9
	pkgsrc-2014Q4:1.9.0.2
	pkgsrc-2014Q4-base:1.9
	pkgsrc-2014Q3:1.8.0.16
	pkgsrc-2014Q3-base:1.8
	pkgsrc-2014Q2:1.8.0.14
	pkgsrc-2014Q2-base:1.8
	pkgsrc-2014Q1:1.8.0.12
	pkgsrc-2014Q1-base:1.8
	pkgsrc-2013Q4:1.8.0.10
	pkgsrc-2013Q4-base:1.8
	pkgsrc-2013Q3:1.8.0.8
	pkgsrc-2013Q3-base:1.8
	pkgsrc-2013Q2:1.8.0.6
	pkgsrc-2013Q2-base:1.8
	pkgsrc-2013Q1:1.8.0.4
	pkgsrc-2013Q1-base:1.8
	pkgsrc-2012Q4:1.8.0.2
	pkgsrc-2012Q4-base:1.8
	pkgsrc-2012Q3:1.7.0.22
	pkgsrc-2012Q3-base:1.7
	pkgsrc-2012Q2:1.7.0.20
	pkgsrc-2012Q2-base:1.7
	pkgsrc-2012Q1:1.7.0.18
	pkgsrc-2012Q1-base:1.7
	pkgsrc-2011Q4:1.7.0.16
	pkgsrc-2011Q4-base:1.7
	pkgsrc-2011Q3:1.7.0.14
	pkgsrc-2011Q3-base:1.7
	pkgsrc-2011Q2:1.7.0.12
	pkgsrc-2011Q2-base:1.7
	pkgsrc-2011Q1:1.7.0.10
	pkgsrc-2011Q1-base:1.7
	pkgsrc-2010Q4:1.7.0.8
	pkgsrc-2010Q4-base:1.7
	pkgsrc-2010Q3:1.7.0.6
	pkgsrc-2010Q3-base:1.7
	pkgsrc-2010Q2:1.7.0.4
	pkgsrc-2010Q2-base:1.7
	pkgsrc-2010Q1:1.7.0.2
	pkgsrc-2010Q1-base:1.7
	pkgsrc-2009Q4:1.6.0.8
	pkgsrc-2009Q4-base:1.6
	pkgsrc-2009Q3:1.6.0.6
	pkgsrc-2009Q3-base:1.6
	pkgsrc-2009Q2:1.6.0.4
	pkgsrc-2009Q2-base:1.6
	pkgsrc-2009Q1:1.6.0.2
	pkgsrc-2009Q1-base:1.6
	pkgsrc-2008Q4:1.5.0.38
	pkgsrc-2008Q4-base:1.5
	pkgsrc-2008Q3:1.5.0.36
	pkgsrc-2008Q3-base:1.5
	cube-native-xorg:1.5.0.34
	cube-native-xorg-base:1.5
	pkgsrc-2008Q2:1.5.0.32
	pkgsrc-2008Q2-base:1.5
	cwrapper:1.5.0.30
	pkgsrc-2008Q1:1.5.0.28
	pkgsrc-2008Q1-base:1.5
	pkgsrc-2007Q4:1.5.0.26
	pkgsrc-2007Q4-base:1.5
	pkgsrc-2007Q3:1.5.0.24
	pkgsrc-2007Q3-base:1.5
	pkgsrc-2007Q2:1.5.0.22
	pkgsrc-2007Q2-base:1.5
	pkgsrc-2007Q1:1.5.0.20
	pkgsrc-2007Q1-base:1.5
	pkgsrc-2006Q4:1.5.0.18
	pkgsrc-2006Q4-base:1.5
	pkgsrc-2006Q3:1.5.0.16
	pkgsrc-2006Q3-base:1.5
	pkgsrc-2006Q2:1.5.0.14
	pkgsrc-2006Q2-base:1.5
	pkgsrc-2006Q1:1.5.0.12
	pkgsrc-2006Q1-base:1.5
	pkgsrc-2005Q4:1.5.0.10
	pkgsrc-2005Q4-base:1.5
	pkgsrc-2005Q3:1.5.0.8
	pkgsrc-2005Q3-base:1.5
	pkgsrc-2005Q2:1.5.0.6
	pkgsrc-2005Q2-base:1.5
	pkgsrc-2005Q1:1.5.0.4
	pkgsrc-2005Q1-base:1.5
	pkgsrc-2004Q4:1.5.0.2
	pkgsrc-2004Q4-base:1.5
	pkgsrc-2004Q3:1.4.0.6
	pkgsrc-2004Q3-base:1.4
	pkgsrc-2004Q2:1.4.0.4
	pkgsrc-2004Q2-base:1.4
	pkgsrc-2004Q1:1.4.0.2
	pkgsrc-2004Q1-base:1.4
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3
	netbsd-1-6-1:1.2.0.2
	netbsd-1-6-1-base:1.2
	netbsd-1-6:1.1.1.1.0.4
	netbsd-1-6-RELEASE-base:1.1
	pkgviews:1.1.1.1.0.6
	pkgviews-base:1.1
	buildlink2-base:1.1.1.1
	buildlink2:1.1.1.1.0.2
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.10
date	2020.05.16.17.58.28;	author nia;	state dead;
branches;
next	1.9;
commitid	2dU4knZSHjNyAu8C;

1.9
date	2014.10.10.20.57.32;	author snj;	state Exp;
branches;
next	1.8;
commitid	7O1NCxSetG0sjHTx;

1.8
date	2012.12.12.12.56.26;	author wiz;	state Exp;
branches;
next	1.7;

1.7
date	2010.02.07.19.30.35;	author snj;	state Exp;
branches;
next	1.6;

1.6
date	2009.02.17.01.08.24;	author snj;	state Exp;
branches;
next	1.5;

1.5
date	2004.11.26.22.18.28;	author snj;	state Exp;
branches;
next	1.4;

1.4
date	2004.02.17.15.20.47;	author snj;	state Exp;
branches;
next	1.3;

1.3
date	2003.09.18.19.16.20;	author wiz;	state Exp;
branches;
next	1.2;

1.2
date	2002.09.11.18.18.21;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	2002.05.20.14.41.57;	author wiz;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2002.05.20.14.41.57;	author wiz;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	2002.05.20.14.41.57;	author jlam;	state dead;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2002.06.23.18.47.01;	author jlam;	state Exp;
branches;
next	;


desc
@@


1.10
log
@qiv: Update to 2.3.2

2.3.2
========
  31.10.2017        [tw] fix: window sometimes recentered, when moved around with mouse
  19.10.2017        [as] fix Makefile for cross-compiling: Make pkg-config substitutable (Debian Bug#879108)
  10.10.2017        [tw] add specfile to build rpm for CentOS
  07.10.2017        [tw] add option --trashbin to use trash bin instead
                         of .qiv-trash when deleting images
  06.10.2017        [as] add ability (and options) to display JPEG comments
  06.10.2017        [as] more sophisticated exiftool call in qiv-command example
  04.10.2017        [tw] fix inconsistent fixed-zoom behaviour
  10.08.2017        [tw] Don't try to rotate if file is not an image
  06.06.2017        [tw] get rid of some more XID collisions
  30.05.2016        [tw] Fix occasionally erratic behaviour of qiv statusbar
                    [tw] Fix xpm autodetection with libmagic
  26.05.2016        [tw] Fix small artefacts in pictures which might
                         happen when running remote over slow link
                         (patch by Derek Schrock)
  20.05.2016        [tw] update image after it is exposed in window mode
  12.05.2016        [js/tw] fix broken "-no-filter" option
                            libmagic filter now works on symlinks
  07.11.2015        [tw] fix linking order in "make debug", did not
                         work in some newer gcc versions
  18.06.2015        [as] turn on EXIF autorotation by default
  13.09.2014        [tw] Add option to sort files by modification time.
                         (patch by Stefan Rüger)
  23.04.2014        [tw] In case of "watch" option, check image only every 1/10 sec,
                         instead of every 200us. This was way too short for
                         devices like RasPi etc. (Hamish)
                    [tw] Leave jumping mode on invalid input and process input key
                         as if it was entered in non jumping mode (Sergey Pinaev)
@
text
@$NetBSD: patch-aa,v 1.9 2014/10/10 20:57:32 snj Exp $

Override hardcoded paths/flags.

--- Makefile.orig	2013-12-19 16:50:37.000000000 -0800
+++ Makefile	2014-10-10 12:42:15.000000000 -0700
@@@@ -4,7 +4,7 @@@@
 #######################################################################
 
 # Directory where qiv will be installed under.
-PREFIX = /usr/local
+#PREFIX = /usr/local
 
 # Font to use for statusbar in fullscreen mode
 STATUSBAR_FONT = "Monospace 9"
@@@@ -49,15 +49,6 @@@@ EXIF = -DHAVE_EXIF
 # Do not edit below here!
 ######################################################################
 
-CC        = gcc
-#CFLAGS    = -O0 -g -Wall
-CFLAGS    = -O2 -Wall \
-	    -fcaller-saves -ffast-math -fno-strength-reduce \
-	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
-#CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
-#	    -fcaller-saves -ffast-math -fno-strength-reduce \
-#	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
-
 INCLUDES  := $(shell pkg-config --cflags gdk-2.0 imlib2)
 LIBS      := $(shell pkg-config --libs gdk-2.0 imlib2) -lX11 -lXext
 
@@@@ -110,10 +101,10 @@@@ DEFINES_G = $(DEFINES) -DDEBUG
 all: $(PROGRAM)
 
 $(PROGRAM): $(OBJS)
-	$(CC) $(CFLAGS) $(DEFINES) $(OBJS) $(LIBS) -o $(PROGRAM)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
 
 $(OBJS): %.o: %.c $(HEADERS)
-	$(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@@
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@@
 
 main.o: main.h
 
@@@@ -137,32 +128,11 @@@@ distclean : clean
 	rm -f $(PROGRAM) $(PROGRAM_G)
 
 install: $(PROGRAM)
-	@@echo "Installing QIV..."
-	@@if [ ! -e $(PREFIX)/bin ]; then \
-	  install -d -m 0755 $(PREFIX)/bin; \
-	  echo install -d -m 0755 $(PREFIX)/bin; \
-        fi
-	install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
-	@@if [ ! -e $(PREFIX)/man/man1 ]; then \
-	  echo install -d -m 0755 $(PREFIX)/man/man1; \
-	  install -d -m 0755 $(PREFIX)/man/man1; \
-	fi
-	install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
-	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
-	@@if [ ! -e $(PREFIX)/share/pixmaps ]; then \
-	  echo install -d -m 0755 $(PREFIX)/share/pixmaps; \
-	  install -d -m 0755 $(PREFIX)/share/pixmaps; \
-	fi
-	install -m 0644 qiv.png $(PREFIX)/share/pixmaps/qiv.png
-	@@if [ ! -e $(PREFIX)/share/applications ]; then \
-	  echo install -d -m 0755 $(PREFIX)/share/applications; \
-	  install -d -m 0755 $(PREFIX)/share/applications; \
-	fi
-	install -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
-	@@if ./qiv -f ./intro.jpg ; \
-	then echo "-- Test Passed --" ; \
-	else echo "-- Test Failed --" ; \
-	fi
-	@@echo "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example $(PREFIX)/bin/qiv-command\n\n"
+	$(BSD_INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
+	$(BSD_INSTALL_DATA) $(PROGRAM).1 $(DESTDIR)$(PREFIX)/man/man1
+	$(BSD_INSTALL_DATA) qiv.png $(DESTDIR)$(PREFIX)/share/pixmaps
+	$(BSD_INSTALL_DATA) qiv.desktop $(DESTDIR)$(PREFIX)/share/applications
+	$(BSD_INSTALL_SCRIPT) contrib/qiv-command.example \
+		$(DESTDIR)$(PREFIX)/share/examples/qiv
 
 # the end... ;-)
@


1.9
log
@Update qiv to 2.3.1.  Changes:

- Add desktop integration.
- Browse option now starts with first picture on command line.
- Fix direction of scrollwheel for next/previous image
- Center mouse cursor position in magnifying window
- Optimize libmagic calls
- Improve display of exif GPS tags
- New option --vikeys to allow for vi-style movement
- Disable screensaver and DPMS during slideshow
- Improvements to qiv-command.example (filename quoting, extract more
  EXIF infos)
- Fix possible segfaults when dealing with corrupt embedded color
  profiles.
- Do not segfault when "browse" option is called without a further
  argument.
- Fix magnifying window. Zoom factor of magnifying window can be
  changed by +/- keys.
- Make conditional rotate leave images that fit alone.
- Add --followlinks option to all symlinks to dirs.
- Fixed inconsistency with rotate option, add conditional rotation
- Add runtime option to display Exif information
- Add runtime option to toggle grab mode
- Add support for embedded color profiles in tiff
- Better fullscreen handling with multi monitors.  Xinerama is no
  longer needed.
- Notice when a mouse click makes the display-text disappear.
- Simplify image-move checking code and allow it to move an image farther.
- Add support for embedded color profiles in jpg
- Add color profile support via lcms2
- When using "--watch" option, make sure pic is not reloaded while still
  written.
@
text
@d1 1
a1 1
$NetBSD$
@


1.8
log
@Update to 2.2.4, provided by ISIHARA Takanori in PR 46167.

2.2.4
=====
  02.05.2011
                    [as] README: added note about obsoleted GTK v1

  28.12.2010
                    [as] qiv-command: more examples from Clint Pachl <pachl@@ecentryx.com>

  02.11.2010
                    [tw] only center image upon reload when center
                         option is active
                    [tw] Do not break install if using a non existing
                         target location (clemens fischer)
                    [tw] make gdk options work again (e.g. --display)
                    [tw] Do not follow symlinked directories, when
                         using recursivedir option (Goswin v. Brederlow)
                    [tw] Add option to change cycle behavior after last
                         picture. (patch by Nicolas Pouillard)
                    [tw] Images were displayed twice when using --browse
                         option. (patch by Adam Lee)
                    [tw] Fix inconsistent behavior when using -x/-y/-z option.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.7 2010/02/07 19:30:35 snj Exp $
d3 4
a6 2
--- Makefile.orig	2011-05-13 13:11:24.000000000 +0000
+++ Makefile
d15 2
a16 2
 STATUSBAR_FONT = "fixed"
@@@@ -45,15 +45,6 @@@@ MAGIC = -DHAVE_MAGIC
d21 1
a21 1
-#CFLAGS    = -O -g -Wall
d30 1
a30 9
 LIBS      := $(shell pkg-config --libs gdk-2.0 imlib2) -lX11
 
@@@@ -83,7 +74,7 @@@@ OBJS_G   += lib/getopt.g lib/getopt1.g
 endif
 
 ifdef GTD_XINERAMA
-LIBS     += -L/usr/X11R6/lib -lXinerama
+LIBS     += -L$(X11BASE)/lib -lXinerama
 endif
d32 1
a32 2
 ifdef MAGIC
@@@@ -99,10 +90,10 @@@@ DEFINES_G = $(DEFINES) -DDEBUG
d45 1
a45 1
@@@@ -126,22 +117,9 @@@@ distclean : clean
d61 10
d75 1
a75 1
-	@@echo "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
d78 3
a80 1
+	$(BSD_INSTALL_SCRIPT) qiv-command.example \
@


1.7
log
@Update to 2.2.3.  Another gtk1 user bites the dust.  Changes:

2.2.3
=====

    add 'Q' icon in qiv-window
    bring back scrollwheel functionality
      Zoom in/out with left/right scroll and forward/back buttons
    change loading of images from imlib2_loader to pixbuf_loader. Adds
      support for additional file types, e.g., pcx, ico, svg, wmf and
      better handling of transparency.
    use gdk_pixbuf to autorotate with EXIF tags instead of libexif.
    Resetting the image (pressing return) no longer destroys "transparency
      checkboard"
    Fix compilation issues with unusual linker defaults.  Update solaris
      Makefile.
    new option to start with default rotation

2.2.2
=====

    fix -x (root window needs colormap)
    patch pango code to avoid garbled output of F1
    fix wrong image size after autorotating

2.2.1
=====

    recognize changed files, using --slideshow and --watch
    sanitize infotextdisplay
    check EXIF tags only after successful file loading
    shuffle now implies not to sort filenames
    fix autorotate with EXIF-tag
    avoid crash calling qiv -x without argument
    fix behaviour of "recursivedir" switch
    added note in README and qiv.h explaining a problem of includes with
      imlib2 up to v1.2
    migrated notes in README from imlib1 to imlib2
    migrated gdk_draw_text() to gdk_draw_layout(), fixing wrong display of
      utf-8 filenames

2.2
===

    migration from imlib1 to imlib2

2.1
===

    removed obsoleted GDK_WA_WMCLASS
      see http://library.gnome.org/devel/gdk/2.11/gdk-Windows.html#GdkWindowAttr
      and http://developer.gimp.org/api/2.0/gtk/GtkWindow.html#gtk-window-set-wmclass
    added patch from Debian gtk_includes.diff, closes: #456854
    added patch from Debian cmdbuflen.diff, closes: #441401
    added patch from Debian man_xscreensaver.diff
    remove xscreensaver left overs from Makefiles
    added autorotate patch (using libexif)
    display initial autorotation in status bar, option "autorotate"
    patch to detect image types using libmagic
    added GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK in image.c
    removed TGA and XBM because not supported by imlib anymore
    exit on unmapped mouse events
    browse option -B, useful when launching qiv from a file manager
    patch to prevent segfault on amd64
    avoid wrapper, include "XLIB_SKIP_ARGB_VISUALS=1" in main.c
    include README and README.TODO in debian package
    README.TODO: fvwm style setting has to be for "therealqiv"
    include Debian changes and package files:
      renamed README.CHANGES to Changelog
      added patch hide_therealqiv (for Debian Bug #326849)
      added patch xmalloc (Debian Bug #383113)
      added patch qiv-manpage-options (Debian Bug #383108)
      don't recurse directories given on command line (better: use -u)
      NOT added: no_background_opts (can't reproduce Debian Bug #351816)
      added patch qiv-nosort
      patch to reset bright/contrast/gamma hitting "o" (2006-06-29)
    more comments and examples in qiv-command
    option -X to set preferred xinerama screen
    key "X" cycles through available xinerama screens
    after 'X' window moves to the new screen right away
    prefix "^" instead "0" for extended call of qiv-command
    workaround-patch by Bart Martens
    for problem with X composite extension
    try keep image on the screen after zooming/rotating
    fixed centering=off behaviour in fullscreen mode
    fixed "magnifying glass" windowsize bug
    fixed compiler warnings "differ in signedness"
    fixed compiler warning "missing sentinel in function call"
    bugfix: statusbar is redrawn after size changes and moves
    "magnifying glass" patch (not perfect yet)
    call of qiv-command with "0"-prefixed option
    Added Patch by Christoph Wegscheider <cw@@wegi.net> (new QIV Debian maintainer).
    Now all free Keys can be used by qiv-command
    Another Xinerama bugfix (statusbar: now displayed on the smaller screen if two are used)
    new qiv-command feature:
      if first output line is like "NEWNAME=xxxxxxx"
      then qiv understands that the filename of the currently
      displayed image has changed to this new name
      (very useful when using qiv-command to rename files)
    fix image position when zooming to avoid wild jumps
    delete files from list if they cannot be loaded
    display text popup after qiv-command not only in fullscreen mode
    qiv_display_text_window: adjust minimum width of box
    after qiv-command also check file size and ctime
    avoid file overwrites in .qiv-select (NEEDS IMPROVING)
    updated and added more examples to qiv-command
   added small patch by Nick Clifton, setting WM_CLASS name to "qiv"
     (attr.wmclass_name).
   changed a-key/copy to real copy (no links anymore)
   patch-bugfix by Christian Lademann
   adden patch by Christian Lademann
     now slideshow (-s) can also be combine with -x/y/z
   added -F Patch by Martin Fiedler
     now stdin can also be used..
   Xinerama bugfix
   small changes in delete-command

Closes PR pkg/40555.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- Makefile.orig	2010-01-10 13:39:08.000000000 -0800
+++ Makefile	2010-02-07 11:02:21.000000000 -0800
d30 9
d52 1
a52 1
@@@@ -126,14 +117,9 @@@@ distclean : clean
d57 4
d62 4
d72 1
a72 1
-	@@echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
@


1.6
log
@Add user-destdir support.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.5 2004/11/26 22:18:28 snj Exp $
d3 2
a4 2
--- Makefile.orig	2004-05-22 00:21:47.000000000 -0700
+++ Makefile	2004-11-26 14:05:41.000000000 -0800
d14 1
a14 1
@@@@ -57,11 +57,6 @@@@ SS_RANDOMIZE = -r
d19 2
a20 1
-CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
d23 3
d27 2
a28 2
 INCLUDES  = `imlib-config --cflags-gdk`
 LIBS      = `imlib-config --libs-gdk`
d30 1
a30 1
@@@@ -96,10 +91,10 @@@@ SS_PROG   = $(PREFIX)/ss-qiv
d43 2
a44 1
@@@@ -124,14 +119,8 @@@@ distclean : clean
d47 1
a47 1
 	@@echo "Installing QIV..."
d55 1
a55 1
-	@@echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n" 
d58 2
d61 1
a61 2
 install-xscreensaver: install
 	@@echo "#!/bin/sh" > $(SS_PROG)
@


1.5
log
@Update to 2.0.

Changes:
* changed round(); to myround(); and fixed Makefile.Solaris
* fixed qiv_display_text_window
* added patch by Joachim Kuebart: if images is < 5 and PgUp is pressed,
*  mage_index might become negative..
* small patch that remove a warning with gcc 3.4
* qiv_display_text_window update (Push any key..) - its really cool! :-)
* cleaned up README, qiv-command.example, manpage..
* Fixed Help-Screen remove. Added qiv-command-stdout support, now "metacam"
  (EXIF-Header) or other tools can be used within qiv and the output is shown
  in a box in the pixture like the helpscreen.
* All arrow-keys = normal moving.
  All arrow-keys+Shift = faster moving.
  NumPad-arrow-keys+NumLock = faster moving.
* Added Xinerama patch by Jeff Dairiki
* fixed manpage (ignore_path_sort was wrong)
* Added patch by HaJo Schatz: "--disable_grab, -G" Disable pointer/kbd grab
  in fullscreen mode for Remote-Display stuff.
@
text
@d1 1
a1 1
$NetBSD$
d51 2
a52 2
+	$(BSD_INSTALL_PROGRAM) $(PROGRAM) $(PREFIX)/bin
+	$(BSD_INSTALL_DATA) $(PROGRAM).1 $(PREFIX)/man/man1
@


1.4
log
@Update to qiv-1.9, add x11 to CATEGORIES, take maintainership, use bl3.
Changes since 1.8:
* -R flag, which puts qiv in readonly mode
* Flickering in fullscreen mode has been reduced
* -F flag, which allows filenames to be read in from a text file
* F11/F12 now {de,in}crease the slide show delay by 1 second
* Mouse cursor is hidden after 1 second of inactivity
* Miscellaneous other bugfixes

Okayed by jmmv and wiz.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.3 2003/09/18 19:16:20 wiz Exp $
d3 2
a4 2
--- Makefile.orig	2003-01-13 03:57:42.000000000 -0800
+++ Makefile	2004-02-17 07:09:06.000000000 -0800
d6 1
a6 1
 ######################################################################
d14 1
a14 1
@@@@ -53,11 +53,6 @@@@ SS_RANDOMIZE = -r
d26 1
a26 1
@@@@ -87,10 +82,10 @@@@ SS_PROG   = $(PREFIX)/ss-qiv
d30 1
a30 1
-	$(CC) $(CFLAGS) $(DEFINES) $(LIBS) $(OBJS) -o $(PROGRAM)
d39 1
a39 1
@@@@ -115,13 +110,8 @@@@ distclean : clean
d42 1
a42 1
 	@@echo "Installing..."
d46 1
a46 1
-	@@if ./qiv -o white -f ./intro.jpg ; \
d50 1
@


1.3
log
@"Honor CFLAGS!", says Soren Jacobsen in PR 22793, and qiv obeys.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- Makefile.orig	2001-06-10 14:35:06.000000000 +0200
+++ Makefile
d14 1
a14 15
@@@@ -24,11 +24,11 @@@@ FILTER = 1
 EXTNS = GIF TIFF XPM XBM PNG PPM PNM PGM PCX BMP EIM JPEG TGA
 
 # Comment this line out if your system doesn't have getopt_long().
-GETOPT_LONG = -DHAVE_GETOPT_LONG
+#GETOPT_LONG = -DHAVE_GETOPT_LONG
 
 # This program will be run on the manual page after it is installed.
 # If you don't want to compress the manpage, change it to 'true'.
-COMPRESS_PROG = gzip -9f 
+COMPRESS_PROG = true
 
 ######################################################################
 
@@@@ -53,8 +53,8 @@@@ SS_RANDOMIZE = -r
d20 18
a37 4
+CC        ?= gcc
+CFLAGS    += -Wall -fomit-frame-pointer -finline-functions \
 	    -fcaller-saves -ffast-math -fno-strength-reduce \
 	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
d39 1
a39 1
@@@@ -112,13 +112,13 @@@@ clean :  
d45 1
a45 3
+	install -c -s -m 0755 $(PROGRAM) $(PREFIX)/bin
+	install -c -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
 	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
d50 2
a51 4
+#	@@if ./qiv -o white -f ./intro.jpg ; \
+#	then echo "-- Test Passed --" ; \
+#	else echo "-- Test Failed --" ; \
+#	fi
@


1.2
log
@Convert to buildlink2.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2002/05/20 14:41:57 wiz Exp $
d3 1
a3 1
--- Makefile.orig	Sun Jun 10 14:35:06 2001
d14 1
a14 1
@@@@ -24,11 +24,11 @@@@
d28 12
a39 1
@@@@ -112,13 +112,13 @@@@
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD$
a27 11
@@@@ -58,8 +58,8 @@@@
 	    -fcaller-saves -ffast-math -fno-strength-reduce \
 	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
 
-INCLUDES  = `imlib-config --cflags-gdk`
-LIBS      = `imlib-config --libs-gdk`
+INCLUDES  = `${IMLIB_CONFIG} --cflags-gdk`
+LIBS      = `${IMLIB_CONFIG} --libs-gdk`
 
 PROGRAM   = qiv
 OBJS      = main.o image.o event.o options.o utils.o
@


1.1.1.1
log
@Initial import of qiv-1.7, a 'Quick Image Viewer'.
Based on pkg/16700 by Marko Schuetz, with major changes.
@
text
@@


1.1.1.1.2.1
log
@file patch-aa was added on branch buildlink2 on 2002-06-23 18:47:01 +0000
@
text
@d1 58
@


1.1.1.1.2.2
log
@Merge from pkgsrc-current to buildlink2 branch.
@
text
@a0 58
$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:47:01 jlam Exp $

--- Makefile.orig	Sun Jun 10 14:35:06 2001
+++ Makefile
@@@@ -4,7 +4,7 @@@@
 ######################################################################
 
 # Directory where qiv will be installed under.
-PREFIX = /usr/local
+#PREFIX = /usr/local
 
 # Font to use for statusbar in fullscreen mode
 STATUSBAR_FONT = "fixed"
@@@@ -24,11 +24,11 @@@@
 EXTNS = GIF TIFF XPM XBM PNG PPM PNM PGM PCX BMP EIM JPEG TGA
 
 # Comment this line out if your system doesn't have getopt_long().
-GETOPT_LONG = -DHAVE_GETOPT_LONG
+#GETOPT_LONG = -DHAVE_GETOPT_LONG
 
 # This program will be run on the manual page after it is installed.
 # If you don't want to compress the manpage, change it to 'true'.
-COMPRESS_PROG = gzip -9f 
+COMPRESS_PROG = true
 
 ######################################################################
 
@@@@ -58,8 +58,8 @@@@
 	    -fcaller-saves -ffast-math -fno-strength-reduce \
 	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
 
-INCLUDES  = `imlib-config --cflags-gdk`
-LIBS      = `imlib-config --libs-gdk`
+INCLUDES  = `${IMLIB_CONFIG} --cflags-gdk`
+LIBS      = `${IMLIB_CONFIG} --libs-gdk`
 
 PROGRAM   = qiv
 OBJS      = main.o image.o event.o options.o utils.o
@@@@ -112,13 +112,13 @@@@
 
 install: $(PROGRAM)
 	@@echo "Installing..."
-	install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
-	install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
+	install -c -s -m 0755 $(PROGRAM) $(PREFIX)/bin
+	install -c -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
 	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
-	@@if ./qiv -o white -f ./intro.jpg ; \
-	then echo "-- Test Passed --" ; \
-	else echo "-- Test Failed --" ; \
-	fi
+#	@@if ./qiv -o white -f ./intro.jpg ; \
+#	then echo "-- Test Passed --" ; \
+#	else echo "-- Test Failed --" ; \
+#	fi
 
 install-xscreensaver: install
 	@@echo "#!/bin/sh" > $(SS_PROG)
@