From 5fcf9de3ecbc373f31a06ede1bf8ae568ee693ef Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Sat, 22 May 2004 08:35:28 +0000
Subject: - Update MASTER_SITES - Pet portlint(1)

PR:		ports/66910
Submitted by:	Roman Neuhauser <neuhauser@chello.cz>
Approved by:	maintainer
---
 x11/wmappl/Makefile    | 12 ++++++++----
 x11/wmappl/pkg-descr   |  2 +-
 x11/wmappl/pkg-message |  2 --
 x11/wmappl/pkg-plist   |  8 ++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'x11/wmappl')

diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index 43eaebed5cba..4afe5aaeddb2 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -9,9 +9,13 @@ PORTNAME=	wmappl
 PORTVERSION=	0.6
 PORTREVISION=	1
 CATEGORIES=	x11 windowmaker
-MASTER_SITES=	http://www.upl.cs.wisc.edu/~charkins/wmappl/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:main/}
+MASTER_SITE_SUBDIR=${PORTNAME}/:main
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main
+
 .ifndef(NOICONS)
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ICONSDIST}
+PATCH_SITES=	http://www.upl.cs.wisc.edu/~charkins/wmappl/
+PATCHFILES=	16x16xpms.tar.gz icons_16x16.tar.gz smallicons.tar.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
@@ -24,7 +28,7 @@ USE_XPM=	yes
 MAKE_ENV=	DATADIR="${DATADIR}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
-ICONSDIST=	16x16xpms.tar.gz icons_16x16.tar.gz smallicons.tar.gz
+
 .ifndef(NOICONS)
 PLIST_SUB=	ICONS=""
 .else
@@ -34,7 +38,7 @@ PLIST_SUB=	ICONS="@comment "
 .ifndef(NOICONS)
 post-extract:
 	@${ECHO_MSG} "===>   Extracting icons ..."
-.for icons in ${ICONSDIST}
+.for icons in ${PATCHFILES}
 	@${ECHO_MSG} "===>   ${icons} ..."
 	@${TAR} -C ${WRKSRC}/icons -xzf ${DISTDIR}/${icons}
 .endfor
diff --git a/x11/wmappl/pkg-descr b/x11/wmappl/pkg-descr
index c7c6040fc7cb..bf10552f1d7d 100644
--- a/x11/wmappl/pkg-descr
+++ b/x11/wmappl/pkg-descr
@@ -2,6 +2,6 @@ A dockapp for WindowMaker that displays a bunch of buttons. Each
 of these can be configured to run an application of your choice.
 Useful for people that have their dock already full.
 
-WWW: http://www.pobox.com/~charkins/wmappl.html
+WWW: http://wmappl.sourceforge.net/
 
 - od <od@iclub.nsu.ru>
diff --git a/x11/wmappl/pkg-message b/x11/wmappl/pkg-message
index 569e43dcde8b..fa0119ab0d16 100644
--- a/x11/wmappl/pkg-message
+++ b/x11/wmappl/pkg-message
@@ -1,4 +1,3 @@
-
 -----------------------------------------------------------
 
 Installed sample.wmapplrc as:
@@ -8,4 +7,3 @@ Installed sample.wmapplrc as:
 modify it if you wish and copy to ~/.wmapplrc
 
 -----------------------------------------------------------
-
diff --git a/x11/wmappl/pkg-plist b/x11/wmappl/pkg-plist
index 726aa554a1f0..6c76d3f2b509 100644
--- a/x11/wmappl/pkg-plist
+++ b/x11/wmappl/pkg-plist
@@ -1,6 +1,6 @@
 bin/wmappl
-%%PORTDOCS%%share/doc/wmappl/README
-share/examples/wmappl/sample.wmapplrc
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%EXAMPLESDIR%%/sample.wmapplrc
 %%ICONS%%share/wmappl/3D.xpm
 %%ICONS%%share/wmappl/3D2.xpm
 %%ICONS%%share/wmappl/3DGun.xpm
@@ -666,5 +666,5 @@ share/examples/wmappl/sample.wmapplrc
 %%ICONS%%share/wmappl/xv.xpm
 %%ICONS%%share/wmappl/yingyang.xpm
 %%ICONS%%@dirrm share/wmappl
-@dirrm share/examples/wmappl
-%%PORTDOCS%%@dirrm share/doc/wmappl
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit v1.2.3