update sxiv to 1.3.1

ok czarkoff@ kirby@
looks fine ajacoutot@
This commit is contained in:
jung 2015-04-16 10:27:26 +00:00
parent aec4bd69ab
commit 2542d976bb
4 changed files with 29 additions and 17 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.5 2014/08/25 15:15:29 kirby Exp $
# $OpenBSD: Makefile,v 1.6 2015/04/16 10:27:26 jung Exp $
COMMENT = simple (or small or suckless) X Image Viewer
GH_PROJECT= sxiv
GH_ACCOUNT= muennich
GH_TAGNAME= v1.1.1
GH_TAGNAME= v1.3.1
DISTNAME= ${GH_PROJECT}-${GH_TAGNAME:S/v//}
CATEGORIES = graphics
CATEGORIES = graphics x11
HOMEPAGE = https://github.com/muennich/sxiv
@ -16,13 +16,14 @@ MAINTAINER = Matthew Via <via@matthewvia.info>
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += Imlib2 X11 c
WANTLIB += Imlib2 exif gif X11 c
LIB_DEPENDS = graphics/imlib2
LIB_DEPENDS = graphics/imlib2 \
graphics/libexif
MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \
CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \
LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2"
LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif -lgif"
NO_TEST = Yes

View File

@ -1,2 +1,2 @@
SHA256 (sxiv-1.1.1.tar.gz) = MFabfLFWin9g0QL26yHyXJPeQiQ6HIrDwaUh1YsIKB8=
SIZE (sxiv-1.1.1.tar.gz) = 37251
SHA256 (sxiv-1.3.1.tar.gz) = mjChsDbhwXISEoVUcJ2j8tZdO+rvLgpzCXr141zxHQ4=
SIZE (sxiv-1.3.1.tar.gz) = 47171

View File

@ -1,8 +1,17 @@
$OpenBSD: patch-Makefile,v 1.2 2013/11/18 17:01:11 jung Exp $
--- Makefile.orig Sun Jun 2 12:04:40 2013
+++ Makefile Sat Oct 19 16:18:10 2013
@@ -28,15 +28,14 @@ clean:
rm -f $(OBJ) sxiv
$OpenBSD: patch-Makefile,v 1.3 2015/04/16 10:27:26 jung Exp $
--- Makefile.orig Sun Nov 16 21:38:30 2014
+++ Makefile Wed Apr 15 23:09:54 2015
@@ -19,7 +19,7 @@ $(OBJ): Makefile
-include $(DEP)
-%.o: %.c
+.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -MMD -MP -c -o $@ $<
config.h:
@@ -32,15 +32,15 @@ clean:
rm -f $(OBJ) $(DEP) sxiv
install: all
- mkdir -p $(DESTDIR)$(PREFIX)/bin
@ -12,8 +21,8 @@ $OpenBSD: patch-Makefile,v 1.2 2013/11/18 17:01:11 jung Exp $
- sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 > $(DESTDIR)$(MANPREFIX)/man1/sxiv.1
- chmod 644 $(DESTDIR)$(MANPREFIX)/man1/sxiv.1
- mkdir -p $(DESTDIR)$(PREFIX)/share/sxiv/exec
- cp image-info $(DESTDIR)$(PREFIX)/share/sxiv/exec/image-info
- chmod 755 $(DESTDIR)$(PREFIX)/share/sxiv/exec/image-info
- cp exec/* $(DESTDIR)$(PREFIX)/share/sxiv/exec/
- chmod 755 $(DESTDIR)$(PREFIX)/share/sxiv/exec/*
+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+ ${BSD_INSTALL_PROGRAM} sxiv ${DESTDIR}${PREFIX}/bin
+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
@ -21,7 +30,8 @@ $OpenBSD: patch-Makefile,v 1.2 2013/11/18 17:01:11 jung Exp $
+ mv sxiv.1.tmp sxiv.1
+ ${BSD_INSTALL_MAN} sxiv.1 ${DESTDIR}${MANPREFIX}/man1
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/sxiv
+ ${BSD_INSTALL_DATA} image-info ${DESTDIR}${PREFIX}/share/examples/sxiv
+ ${BSD_INSTALL_DATA} exec/image-info ${DESTDIR}${PREFIX}/share/examples/sxiv
+ ${BSD_INSTALL_DATA} exec/key-handler ${DESTDIR}${PREFIX}/share/examples/sxiv
uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/sxiv

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2013/11/18 17:01:11 jung Exp $
@comment $OpenBSD: PLIST,v 1.3 2015/04/16 10:27:26 jung Exp $
@bin bin/sxiv
@man man/man1/sxiv.1
share/examples/sxiv/
share/examples/sxiv/image-info
share/examples/sxiv/key-handler