sent: Update wip/sent to sent-1

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Jan 7 23:09:12 2018 +0100
Changeset:	efa3ad1ff3422ca1bc76ec1ba3c8f388cd3f324a

Modified Files:
	sent/DESCR
	sent/Makefile
	sent/PLIST
	sent/distinfo

Log Message:
sent: Update wip/sent to sent-1

pkgsrc changes:
 - Add a run dependency to bzip2 and farbfeld (bunzip2 and 2ff are
   referenced/used in the default config.h)
 - Delete not needed SUBST_SED commands (`-DHAVE_SHADOW_H' does not appear in
   any *CFLAGS and no need to substitute `cc')
 - Delete `-I/usr/include/freetype2', freetype2 is not really used/needed by sent
 - Do not include graphics/freetype2, graphics/png and wip/farbfeld bl3, no (longer)
   needed per-upstream changes

Changes:
sent-1
------
 - Use farbfeld for images. No libpng support anymore (but farbfeld can handle
   png as well as many more formats, so not a regression).
 - Bind key r to refresh the slide set from file. Useful when drafting/writing
   slides.
 - Support for transparent images.
 - Many bug fixes and simplifications.
 - More key mappings by default.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=efa3ad1ff3422ca1bc76ec1ba3c8f388cd3f324a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sent/DESCR    |  2 +-
 sent/Makefile | 17 +++++++++++------
 sent/PLIST    |  1 +
 sent/distinfo |  8 ++++----
 4 files changed, 17 insertions(+), 11 deletions(-)

diffs:
diff --git a/sent/DESCR b/sent/DESCR
index 6c7de211bd..9aff5ee780 100644
--- a/sent/DESCR
+++ b/sent/DESCR
@@ -7,5 +7,5 @@ to write down the presentation for a quick lightning talk within a few minutes.
 The presentation is displayed in a simple X11 window colored black on white
 for maximum contrast even if the sun shines directly onto the projected image.
 The content of each slide is automatically scaled to fit the window so you
-don’t have to worry about alignment. Instead you can really concentrate
+don't have to worry about alignment. Instead you can really concentrate
 on the content.
diff --git a/sent/Makefile b/sent/Makefile
index cc7fa1f041..945f5152dc 100644
--- a/sent/Makefile
+++ b/sent/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	sent-0.2
+DISTNAME=	sent-1
 CATEGORIES=	textproc
 MASTER_SITES=	http://dl.suckless.org/tools/
 
@@ -9,6 +9,12 @@ HOMEPAGE=	http://tools.suckless.org/sent/
 COMMENT=	Simple plaintext presentation tool
 LICENSE=	mit
 
+USE_TOOLS+=	bzip2:run	# for bunzip2
+
+WRKSRC=		${WRKDIR}
+
+DEPENDS+=	farbfeld-[0-9]*:../../wip/farbfeld	# for 2ff
+
 SUBST_CLASSES+=         makefile
 SUBST_STAGE.makefile=   pre-configure
 SUBST_MESSAGE.makefile= Adjust config.mk
@@ -16,16 +22,15 @@ SUBST_FILES.makefile=   config.mk
 SUBST_SED.makefile+=    -e 's,/usr/local,${PREFIX},g'
 SUBST_SED.makefile+=    -e 's,share/man,${PKGMANDIR},g'
 SUBST_SED.makefile+=    -e 's,/usr/X11R6,${X11BASE},'
-SUBST_SED.makefile+=    -e '/^CPPFLAGS/ s,-DHAVE_SHADOW_H,,'
 SUBST_SED.makefile+=    -e 's,^CFLAGS *= ,CFLAGS += ,'
 SUBST_SED.makefile+=    -e 's,^CPPFLAGS *= ,CPPFLAGS += ,'
 SUBST_SED.makefile+=    -e 's,^LDFLAGS *= ,LDFLAGS += ,'
-SUBST_SED.makefile+=    -e 's/cc/${CC:Q}/'
+SUBST_SED.makefile+=    -e 's,^LDFLAGS *= ,LDFLAGS += ,'
+# XXX: freetype2 is not needed, do not add it to CFLAGS.
+SUBST_SED.makefile+=	-e 's,-I/usr/include/freetype2,,'
 
 INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1
 
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../wip/farbfeld/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sent/PLIST b/sent/PLIST
index ff921bd1dc..0d27adb786 100644
--- a/sent/PLIST
+++ b/sent/PLIST
@@ -1,2 +1,3 @@
 @comment $NetBSD$
 bin/sent
+man/man${PKGVERSION}/sent.${PKGVERSION}
diff --git a/sent/distinfo b/sent/distinfo
index bc1ed06352..845c57d8f9 100644
--- a/sent/distinfo
+++ b/sent/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (sent-0.2.tar.gz) = bace0d09f785082bcc738a6ec6010bc8b1a4b1b5
-RMD160 (sent-0.2.tar.gz) = 9ad8b0ac778220275ff1907fab505d89e20582a3
-SHA512 (sent-0.2.tar.gz) = 22c1e1e1bb7dbdaacb75a71a34ab533ca17b632e505ff96a351a907b861009b748502f7ad2934397f40842bef11e3072e814952a6abb141d470d0bb2e34a1540
-Size (sent-0.2.tar.gz) = 13479 bytes
+SHA1 (sent-1.tar.gz) = cb22066136eca4960eb996839cf2772f1d2fc200
+RMD160 (sent-1.tar.gz) = ca2d209344a1ab7e298b11f51d5532f3cdf6c9c0
+SHA512 (sent-1.tar.gz) = 4797468bf949de507662253eac1ec80f566553051f407a55a88ccdd6544532c0d8d0f51bb11b88bdff78e6630519558049569ac0c9d3d8279f243882653ef1c0
+Size (sent-1.tar.gz) = 15285 bytes