4 files changed, 49 insertions, 12 deletions

diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 051d98ec4722..d5e9f86dc871 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -6,23 +6,41 @@
 #
 
 PORTNAME=	libdockapp
-PORTVERSION=	0.4.0
+PORTVERSION=	0.6.0
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/ \
-		http://soupnazi.org/FreeBSD/ports/distfiles/
+MASTER_SITES=	http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Standard library for Window Maker dock apps
 
+WRKSRC=		${WRKDIR}/${PORTNAME:S/^lib//}-${PORTVERSION}
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_LIBTOOL_VER=15
+USE_LIBTOOL_VER=	15
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--without-font --without-examples
 INSTALLS_SHLIB=	yes
-USE_REINPLACE=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
+post-install:
+	@${MKDIR} ${PREFIX}/lib/X11/fonts/dockapp
+.for file in fonts.alias fonts.dir *.pcf.gz
+	${INSTALL_DATA} ${WRKSRC}/fonts/${file} ${PREFIX}/lib/X11/fonts/dockapp
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+.for file in README
+	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${EXAMPLESDIR}
+.endfor
+	@${MKDIR} ${EXAMPLESDIR}/basic
+.for file in Imakefile README *.c *.xpm
+	${INSTALL_DATA} ${WRKSRC}/examples/basic/${file} ${EXAMPLESDIR}/basic
+.endfor
+	@${MKDIR} ${EXAMPLESDIR}/rectangles
+.for file in Imakefile *.c
+	${INSTALL_DATA} ${WRKSRC}/examples/rectangles/${file} ${EXAMPLESDIR}/rectangles
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/libdockapp/distinfo b/x11-wm/libdockapp/distinfo
index 1ff7714b0466..85d5b34fbb04 100644
--- a/x11-wm/libdockapp/distinfo
+++ b/x11-wm/libdockapp/distinfo
@@ -1,2 +1,2 @@
-MD5 (libdockapp-0.4.0.tar.bz2) = 96c72891bde88808206cfb1de341edc1
-SIZE (libdockapp-0.4.0.tar.bz2) = 89796
+MD5 (libdockapp-0.6.0.tar.bz2) = fcad826f544c67f8fdde2802f46fd330
+SIZE (libdockapp-0.6.0.tar.bz2) = 308705
diff --git a/x11-wm/libdockapp/pkg-descr b/x11-wm/libdockapp/pkg-descr
index cfd3aa46f2fd..d604688b7478 100644
--- a/x11-wm/libdockapp/pkg-descr
+++ b/x11-wm/libdockapp/pkg-descr
@@ -1,3 +1,7 @@
-Standard library for Window Maker dock apps.
+LibDockApp is a library that provides a framework for developing
+dockapps. It provides functions and structures to define and display
+command-line options, create a dockable icon, handle events, etc.
+
+WWW: http://solfertje.student.utwente.nl/~dalroi/libdockapp/
 
 - Jim <jim@FreeBSD.org>
diff --git a/x11-wm/libdockapp/pkg-plist b/x11-wm/libdockapp/pkg-plist
index 22893ebf99b3..72e6d20f2c27 100644
--- a/x11-wm/libdockapp/pkg-plist
+++ b/x11-wm/libdockapp/pkg-plist
@@ -1,4 +1,19 @@
 include/dockapp.h
 lib/libdockapp.a
 lib/libdockapp.so
-lib/libdockapp.so.1
+lib/libdockapp.so.2
+lib/X11/fonts/dockapp/fonts.alias
+lib/X11/fonts/dockapp/fonts.dir
+lib/X11/fonts/dockapp/luxel-ascii-06x09.pcf.gz
+lib/X11/fonts/dockapp/seg7-ascii-05x07.pcf.gz
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/basic/Imakefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/basic/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/basic/ball_red.xpm
+%%PORTDOCS%%%%EXAMPLESDIR%%/basic/basic.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/rectangles/Imakefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/rectangles/rectangles.c
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/rectangles
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/basic
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm lib/X11/fonts/dockapp