svn commit: r463177 - in head/x11-wm: libwraster windowmaker

[Hiroki Sato]

Author: hrs
Date: Wed Feb 28 04:58:15 2018
New Revision: 463177
URL: https://svnweb.freebsd.org/changeset/ports/463177

Log:
  Update libwraster to 0.95.8 and make x11-wm/windowmaker
  depend on the correct version.

Modified:
  head/x11-wm/libwraster/Makefile
  head/x11-wm/libwraster/distinfo
  head/x11-wm/libwraster/pkg-plist
  head/x11-wm/windowmaker/Makefile
  head/x11-wm/windowmaker/distinfo

Modified: head/x11-wm/libwraster/Makefile
==============================================================================
--- head/x11-wm/libwraster/Makefile	Wed Feb 28 04:28:07 2018	(r463176)
+++ head/x11-wm/libwraster/Makefile	Wed Feb 28 04:58:15 2018	(r463177)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libwraster
-PORTVERSION=	0.95.7
-PORTREVISION=	5
+PORTVERSION=	0.95.8
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
@@ -19,9 +18,9 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libwebp.so:graphics/webp \
 		libMagickWand-6.so:graphics/ImageMagick
 
-USES=		jpeg libtool pathfix pkgconfig
+USES=		jpeg libtool localbase pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_XORG=	xft xinerama xmu xpm
+USE_XORG=	x11 xext xft xinerama xmu xpm
 BUILD_WRKSRC=	${WRKSRC}/wrlib
 INSTALL_WRKSRC=	${WRKSRC}/wrlib
 GNU_CONFIGURE=	yes
@@ -35,8 +34,6 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11
 		--enable-usermenu \
 		--enable-wmreplace \
 		--with-x
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 pre-build:

Modified: head/x11-wm/libwraster/distinfo
==============================================================================
--- head/x11-wm/libwraster/distinfo	Wed Feb 28 04:28:07 2018	(r463176)
+++ head/x11-wm/libwraster/distinfo	Wed Feb 28 04:58:15 2018	(r463177)
@@ -1,2 +1,3 @@
-SHA256 (WindowMaker-0.95.7.tar.gz) = 842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9
-SIZE (WindowMaker-0.95.7.tar.gz) = 3238325
+TIMESTAMP = 1519792748
+SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
+SIZE (WindowMaker-0.95.8.tar.gz) = 3253515

Modified: head/x11-wm/libwraster/pkg-plist
==============================================================================
--- head/x11-wm/libwraster/pkg-plist	Wed Feb 28 04:28:07 2018	(r463176)
+++ head/x11-wm/libwraster/pkg-plist	Wed Feb 28 04:58:15 2018	(r463177)
@@ -2,7 +2,7 @@ bin/get-wraster-flags
 include/wraster.h
 lib/libwraster.a
 lib/libwraster.so
-lib/libwraster.so.5
-lib/libwraster.so.5.0.0
+lib/libwraster.so.6
+lib/libwraster.so.6.0.0
 libdata/pkgconfig/wrlib.pc
 man/man1/get-wraster-flags.1.gz

Modified: head/x11-wm/windowmaker/Makefile
==============================================================================
--- head/x11-wm/windowmaker/Makefile	Wed Feb 28 04:28:07 2018	(r463176)
+++ head/x11-wm/windowmaker/Makefile	Wed Feb 28 04:58:15 2018	(r463177)
@@ -3,6 +3,7 @@
 
 PORTNAME=	windowmaker
 PORTVERSION=	0.95.8
+PORTREVISION=	1
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
@@ -18,7 +19,7 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libMagickWand-6.so:graphics/ImageMagick \
-		libwraster.so:x11-wm/libwraster \
+		libwraster.so.6:x11-wm/libwraster \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libexif.so:graphics/libexif
@@ -26,7 +27,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/Lee
 
 USES=		jpeg libtool shebangfix pathfix perl5 pkgconfig
 USE_LDCONFIG=	yes
-USE_XORG=	xft xinerama xmu xpm x11 xext
+USE_XORG=	x11 xext xft xinerama xmu xpm
 SHEBANG_FILES=	util/wkdemenu.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no \

Modified: head/x11-wm/windowmaker/distinfo
==============================================================================
--- head/x11-wm/windowmaker/distinfo	Wed Feb 28 04:28:07 2018	(r463176)
+++ head/x11-wm/windowmaker/distinfo	Wed Feb 28 04:58:15 2018	(r463177)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497386665
+TIMESTAMP = 1519793700
 SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
 SIZE (WindowMaker-0.95.8.tar.gz) = 3253515