Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 graphics/sxiv/BUILD         |    2 +-
 graphics/sxiv/CONFIGURE     |    5 +++++
 graphics/sxiv/DEPENDS       |    9 +++++----
 graphics/sxiv/DETAILS       |    4 ++--
 graphics/sxiv/HISTORY       |    8 ++++++++
 graphics/sxiv/PRE_BUILD     |    2 +-
 graphics/sxiv/dep-opt.patch |   19 -------------------
 7 files changed, 22 insertions(+), 27 deletions(-)

New commits:
commit 0d77163aaa979f24ca907dbb6fcbc34adc67fbf7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    sxiv: => 24

diff --git a/graphics/sxiv/BUILD b/graphics/sxiv/BUILD
index e013570..c044324 100755
--- a/graphics/sxiv/BUILD
+++ b/graphics/sxiv/BUILD
@@ -1 +1 @@
-make ${OPTS} PREFIX="${INSTALL_ROOT}/usr"
+make ${OPTS} ${SXIV_OPTS} PREFIX="${INSTALL_ROOT}/usr"
diff --git a/graphics/sxiv/CONFIGURE b/graphics/sxiv/CONFIGURE
new file mode 100755
index 0000000..347301e
--- /dev/null
+++ b/graphics/sxiv/CONFIGURE
@@ -0,0 +1,5 @@
+config_query_option SXIV_OPTS "Enable autoreload support?" y \
+                              "AUTORELOAD=inotify" \
+                              "AUTORELOAD=nop" &&
+
+config_query_string SXIV_FONT "Specify Xft font to use:" "monospace:size=8"
diff --git a/graphics/sxiv/DEPENDS b/graphics/sxiv/DEPENDS
index 724a21e..cc528c9 100755
--- a/graphics/sxiv/DEPENDS
+++ b/graphics/sxiv/DEPENDS
@@ -1,12 +1,13 @@
 depends libx11 &&
+depends libxft &&
 depends imlib2 &&
 
 optional_depends GIFLIB \
-                 "WITH_GIFLIB=1" \
-                 "WITH_GIFLIB=0" \
+                 "HAVE_GIFLIB=1" \
+                 "HAVE_GIFLIB=0" \
                  "for GIF animations support" &&
 
 optional_depends libexif \
-                 "WITH_LIBEXIF=1" \
-                 "WITH_LIBEXIF=0" \
+                 "HAVE_LIBEXIF=1" \
+                 "HAVE_LIBEXIF=0" \
                  "for JPEG auto-orientation and EXIF thumbnails support"
diff --git a/graphics/sxiv/DETAILS b/graphics/sxiv/DETAILS
index 179aba6..4f2d0ab 100755
--- a/graphics/sxiv/DETAILS
+++ b/graphics/sxiv/DETAILS
@@ -1,8 +1,8 @@
            SPELL=sxiv
-         VERSION=1.3.2
+         VERSION=24
           SOURCE=${SPELL}-${VERSION}.tar.gz
    
SOURCE_URL[0]=https://github.com/muennich/${SPELL}/archive/v${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:3bcf67a778a3e40cb6ae6b6fcc685cd57e303265df34c8a56d6ebb8ad0237e7136e738c44fee5c5504c73e4722d017f1e746691fac482568b2a960931f1ecdd5
+     
SOURCE_HASH=sha512:e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE=https://github.com/muennich/sxiv
       LICENSE[0]=GPL
diff --git a/graphics/sxiv/HISTORY b/graphics/sxiv/HISTORY
index c9786c8..5b5eb7d 100644
--- a/graphics/sxiv/HISTORY
+++ b/graphics/sxiv/HISTORY
@@ -1,3 +1,11 @@
+2017-10-28 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 24
+       * DEPENDS: added libxft, corrected flags
+       * CONFIGURE: added, for autoreload option and font configuration
+       * BUILD: use SXIV_OPTS
+       * PRE_BUILD: use SXIV_FONT
+       * dep-opt.patch: dropped, fixed by upstream
+
 2016-12-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, FINAL, 
POST_RE{MOVE,SURRECT}:
          created spell, version 1.3.2
diff --git a/graphics/sxiv/PRE_BUILD b/graphics/sxiv/PRE_BUILD
index de4f0ce..3f11f0d 100755
--- a/graphics/sxiv/PRE_BUILD
+++ b/graphics/sxiv/PRE_BUILD
@@ -1,4 +1,4 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
 
-patch -p0 < "${SPELL_DIRECTORY}/dep-opt.patch"
+sedit "s/\(BAR_FONT =\) .*/\1 \"${SXIV_FONT}\";/" config.def.h
diff --git a/graphics/sxiv/dep-opt.patch b/graphics/sxiv/dep-opt.patch
deleted file mode 100644
index 4cb7602..0000000
--- a/graphics/sxiv/dep-opt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig      2015-12-20 07:21:25.000000000 -0500
-+++ Makefile   2016-12-26 17:24:03.031882664 -0500
-@@ -11,12 +11,15 @@
- 
- # optional dependencies:
- # giflib: gif animations
-+ifeq ($(WITH_GIFLIB), 1)
-       CPPFLAGS += -DHAVE_GIFLIB
-       LIBS     += -lgif
-+endif
- # libexif: jpeg auto-orientation, exif thumbnails
-+ifeq ($(WITH_LIBEXIF), 1)
-       CPPFLAGS += -DHAVE_LIBEXIF
-       LIBS     += -lexif
--
-+endif
- 
- .PHONY: clean install uninstall
-