On Sat, Oct 19, 2013 at 8:24 AM, Joerg Jung <m...@umaxx.net> wrote: > Hi, > > please find below an update for sxiv to version 1.1.1. > > Comments? OKs?
ok bentley@ > Index: Makefile > =================================================================== > RCS file: /cvs/ports/graphics/sxiv/Makefile,v > retrieving revision 1.3 > diff -u -p -r1.3 Makefile > --- Makefile 11 Mar 2013 11:10:55 -0000 1.3 > +++ Makefile 19 Oct 2013 14:22:12 -0000 > @@ -2,7 +2,10 @@ > > COMMENT = simple (or small or suckless) X Image Viewer > > -DISTNAME = sxiv-1.0 > +V= 1.1.1 > +DISTNAME= v${V} > +DIST_SUBDIR= sxiv > +PKGNAME= sxiv-${V} > > CATEGORIES = graphics > > @@ -10,6 +13,8 @@ HOMEPAGE = https://github.com/muennich/s > > MAINTAINER = Matthew Via <v...@matthewvia.info> > > +MASTER_SITES= ${HOMEPAGE}/archive/ > + > # GPLv2+ > PERMIT_PACKAGE_CDROM = Yes > > @@ -21,8 +26,8 @@ MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX > CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \ > LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2" > > -MASTER_SITES = https://github.com/muennich/sxiv/downloads/ > - > NO_TEST = Yes > + > +WRKDIST= ${WRKDIR}/${PKGNAME} > > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/graphics/sxiv/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 27 Feb 2012 08:45:50 -0000 1.1.1.1 > +++ distinfo 19 Oct 2013 14:22:12 -0000 > @@ -1,5 +1,2 @@ > -MD5 (sxiv-1.0.tar.gz) = yIfgrx5NWhAbKFpG0ojEGQ== > -RMD160 (sxiv-1.0.tar.gz) = 0r72IRm2kcu17I6B3l1T4J5XPmQ= > -SHA1 (sxiv-1.0.tar.gz) = 4p4zw4/SpsiiyzsnB3aFkyiqjg4= > -SHA256 (sxiv-1.0.tar.gz) = +kkYnXvBOb09xQqk6Tn+RIDFJBF+2J26ej9U2lATiF8= > -SIZE (sxiv-1.0.tar.gz) = 33568 > +SHA256 (sxiv/v1.1.1.tar.gz) = MFabfLFWin9g0QL26yHyXJPeQiQ6HIrDwaUh1YsIKB8= > +SIZE (sxiv/v1.1.1.tar.gz) = 37251 > Index: patches/patch-Makefile > =================================================================== > RCS file: /cvs/ports/graphics/sxiv/patches/patch-Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 patch-Makefile > --- patches/patch-Makefile 27 Feb 2012 08:45:50 -0000 1.1.1.1 > +++ patches/patch-Makefile 19 Oct 2013 14:22:12 -0000 > @@ -1,36 +1,27 @@ > $OpenBSD: patch-Makefile,v 1.1.1.1 2012/02/27 08:45:50 bentley Exp $ > ---- Makefile.orig Mon Oct 31 08:56:58 2011 > -+++ Makefile Mon Feb 27 01:16:58 2012 > -@@ -22,12 +22,12 @@ options: > - > - .c.o: > - @echo "CC $<" > -- @$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $< > -+ $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $< > - > - $(OBJ) config: Makefile config.h > - > - config: config.c > -- @$(CC) $(CFLAGS) -o $@ $@.c > -+ $(CC) $(CFLAGS) -o $@ $@.c > - > - config.h: > - @echo "creating $@ from config.def.h" > -@@ -35,7 +35,7 @@ config.h: > - > - sxiv: $(OBJ) config > - @echo "CC -o $@" > -- @$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $$(./config -l) > -+ $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $$(./config -l) > - > - clean: > - @echo "cleaning" > -@@ -52,7 +52,7 @@ dist: clean > +--- 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 > > install: all > - @echo "installing executable file to $(DESTDIR)$(PREFIX)/bin" > -- @install -D -m 755 sxiv $(DESTDIR)$(PREFIX)/bin/sxiv > -+ @install -m 755 sxiv $(DESTDIR)$(PREFIX)/bin/sxiv > - @echo "installing manual page to $(DESTDIR)$(MANPREFIX)/man1" > - @mkdir -p $(DESTDIR)$(MANPREFIX)/man1 > - @sed "s/VERSION/$(VERSION)/g" sxiv.1 > > $(DESTDIR)$(MANPREFIX)/man1/sxiv.1 > +- mkdir -p $(DESTDIR)$(PREFIX)/bin > +- cp sxiv $(DESTDIR)$(PREFIX)/bin/ > +- chmod 755 $(DESTDIR)$(PREFIX)/bin/sxiv > +- mkdir -p $(DESTDIR)$(MANPREFIX)/man1 > +- 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 > ++ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin > ++ ${BSD_INSTALL_PROGRAM} sxiv ${DESTDIR}${PREFIX}/bin > ++ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1 > ++ sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 > sxiv.1.tmp > ++ 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 > + > + uninstall: > + rm -f $(DESTDIR)$(PREFIX)/bin/sxiv > Index: patches/patch-main_c > =================================================================== > RCS file: patches/patch-main_c > diff -N patches/patch-main_c > --- patches/patch-main_c 27 Feb 2012 08:45:50 -0000 1.1.1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,11 +0,0 @@ > -$OpenBSD: patch-main_c,v 1.1.1.1 2012/02/27 08:45:50 bentley Exp $ > ---- main.c.orig Mon Oct 31 10:57:09 2011 > -+++ main.c Sun Feb 26 16:34:43 2012 > -@@ -23,6 +23,7 @@ > - #include <stdio.h> > - #include <string.h> > - #include <unistd.h> > -+#include <sys/select.h> > - #include <sys/stat.h> > - #include <sys/time.h> > - #include <X11/Xutil.h> > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/graphics/sxiv/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 PLIST > --- pkg/PLIST 27 Feb 2012 08:45:50 -0000 1.1.1.1 > +++ pkg/PLIST 19 Oct 2013 14:22:12 -0000 > @@ -1,3 +1,5 @@ > @comment $OpenBSD: PLIST,v 1.1.1.1 2012/02/27 08:45:50 bentley Exp $ > @bin bin/sxiv > @man man/man1/sxiv.1 > +share/examples/sxiv/ > +share/examples/sxiv/image-info >