x11-wm/libdockapp: Update to 0.7.2

While I'm here:

* Change MASTER_SITES to upstream's new location
* Add license and path to the license file
* Sort variables a bit according to the PHB
* Simplify pkg-plist substitution for the installation of example files

Add some patches as well as just bumping the port revision for the following
ports due changed location of the header files:

* net/wmnetload
* x11/xscreensaver.app

Changelog:

https://github.com/d-torrance/dockapps/blob/master/libdockapp/ChangeLog

PR:		235923
Approved by:	miwi (mentor), maintainer timeout
Differential Revision:	https://reviews.freebsd.org/D19508

3 files changed, 31 insertions, 23 deletions

diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index b58317c7741b..64d04513ddff 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -2,26 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	libdockapp
-PORTVERSION=	0.6.2
-PORTREVISION=	5
+PORTVERSION=	0.7.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	LOCAL/xride
+MASTER_SITES=	https://www.dockapps.net/download/
 
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	Standard library for Window Maker dock apps
 
-OPTIONS_DEFINE=	EXAMPLES
-OPTIONS_SUB=	yes
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	mkfontdir:x11-fonts/mkfontscale
 
-USES=		libtool fonts tar:bzip2
+USES=		autoreconf fonts libtool pkgconfig
 USE_LDCONFIG=	yes
-USE_XORG=	xext xpm
+USE_XORG=	fontutil x11 xext xpm
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-font --without-examples
 
+WRKSRC=		${WRKDIR}/dockapps-b9baa8f
+
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-.for file in fonts.alias *.pcf.gz
+.for file in *.pcf.gz
 	${INSTALL_DATA} ${WRKSRC}/fonts/${file} ${STAGEDIR}${FONTSDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@@ -29,11 +35,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/basic
-.for file in Imakefile README *.c *.xpm
+.for file in README *.c *.xpm
 	${INSTALL_DATA} ${WRKSRC}/examples/basic/${file} ${STAGEDIR}${EXAMPLESDIR}/basic
 .endfor
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/rectangles
-.for file in Imakefile *.c
+.for file in *.c
 	${INSTALL_DATA} ${WRKSRC}/examples/rectangles/${file} ${STAGEDIR}${EXAMPLESDIR}/rectangles
 .endfor
 
diff --git a/x11-wm/libdockapp/distinfo b/x11-wm/libdockapp/distinfo
index ef5c03ad2152..52502d36412f 100644
--- a/x11-wm/libdockapp/distinfo
+++ b/x11-wm/libdockapp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libdockapp-0.6.2.tar.bz2) = b0a262031342a2e0ac4e5487ffe9071ace4234899022488ec90111241f24b601
-SIZE (libdockapp-0.6.2.tar.bz2) = 540677
+TIMESTAMP = 1549754883
+SHA256 (libdockapp-0.7.2.tar.gz) = df7a24f32a70b878bf280f0754529335ffa3bac44bf7a59cd1277f5cf13f4264
+SIZE (libdockapp-0.7.2.tar.gz) = 39434
diff --git a/x11-wm/libdockapp/pkg-plist b/x11-wm/libdockapp/pkg-plist
index e021ff8acac3..b1a1e2dd8b7a 100644
--- a/x11-wm/libdockapp/pkg-plist
+++ b/x11-wm/libdockapp/pkg-plist
@@ -1,15 +1,16 @@
-include/dockapp.h
+include/libdockapp/dockapp.h
+include/libdockapp/list.h
+include/libdockapp/misc.h
+include/libdockapp/wmgeneral.h
 lib/libdockapp.a
 lib/libdockapp.so
-lib/libdockapp.so.2
-lib/libdockapp.so.2.0.0
-%%FONTSDIR%%/fonts.alias
+lib/libdockapp.so.3
+lib/libdockapp.so.3.0.0
+libdata/pkgconfig/dockapp.pc
 %%FONTSDIR%%/luxel-ascii-06x09.pcf.gz
 %%FONTSDIR%%/seg7-ascii-05x07.pcf.gz
-%%EXAMPLES%%%%EXAMPLESDIR%%/README
-%%EXAMPLES%%%%EXAMPLESDIR%%/basic/Imakefile
-%%EXAMPLES%%%%EXAMPLESDIR%%/basic/README
-%%EXAMPLES%%%%EXAMPLESDIR%%/basic/ball_red.xpm
-%%EXAMPLES%%%%EXAMPLESDIR%%/basic/basic.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/rectangles/Imakefile
-%%EXAMPLES%%%%EXAMPLESDIR%%/rectangles/rectangles.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/ball_red.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/basic.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rectangles/rectangles.c