Removed redundant definition for WRKSRC. Changed one instance of

${WRKSRC}/.. to ${WRKDIR}. As this instance refers to a file that comes
from an archive which is unpacked in ${WRKDIR}, this is aesthetically
ok. While here, sorted the PLIST.

2 files changed, 46 insertions, 47 deletions

diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile
index 9aa26e5359b..5f9e308beb6 100644
--- a/graphics/GMT/Makefile
+++ b/graphics/GMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/22 08:34:54 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/11/03 22:30:35 rillig Exp $
 
 DISTNAME=	GMT3.4
 PKGNAME=	GMT-3.4
@@ -21,7 +21,6 @@ COMMENT=	Generic Mapping Tools
 EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	${DISTNAME}
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
@@ -55,7 +54,7 @@ post-install:
 	cd ${WRKSRC}/tutorial && ${INSTALL_DATA} bermuda.grd quakes.cpt \
 		ship.xyz us.grd data quakes.ngdc 			\
 		${PREFIX}/share/examples/gmt/tutorial;
-	${INSTALL_DATA} ${WRKSRC}/../share/* ${PREFIX}/share/gmt
+	${INSTALL_DATA} ${WRKDIR}/share/* ${PREFIX}/share/gmt
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/examples/
 	cd ${WRKSRC}/examples && ${PAX} -rw . ${PREFIX}/share/examples/gmt
diff --git a/graphics/GMT/PLIST b/graphics/GMT/PLIST
index 24b08c3224a..e684a93d1f9 100644
--- a/graphics/GMT/PLIST
+++ b/graphics/GMT/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/11/03 22:30:35 rillig Exp $
 bin/GMT
 bin/backtracker
 bin/binlegs
@@ -862,48 +862,47 @@ share/examples/gmt/do_examples.bash
 share/examples/gmt/do_examples.csh
 share/examples/gmt/do_view.bash
 share/examples/gmt/do_view.csh
-share/examples/gmt/ex01/osu91a1f_16.grd
-share/examples/gmt/ex01/job01.csh
 share/examples/gmt/ex01/job01.bash
-share/examples/gmt/ex02/HI_topo2.grd
+share/examples/gmt/ex01/job01.csh
+share/examples/gmt/ex01/osu91a1f_16.grd
 share/examples/gmt/ex02/HI_geoid2.grd
+share/examples/gmt/ex02/HI_topo2.grd
 share/examples/gmt/ex02/job02.bash
 share/examples/gmt/ex02/job02.csh
+share/examples/gmt/ex03/job03.bash
+share/examples/gmt/ex03/job03.csh
 share/examples/gmt/ex03/sat.xyg
 share/examples/gmt/ex03/ship.xyg
 share/examples/gmt/ex03/shipsat.dos
-share/examples/gmt/ex03/job03.csh
-share/examples/gmt/ex03/job03.bash
 share/examples/gmt/ex04/HI_geoid4.grd
-share/examples/gmt/ex04/topo.cpt
 share/examples/gmt/ex04/HI_topo4.grd
 share/examples/gmt/ex04/geoid.cpt
-share/examples/gmt/ex04/job04.csh
 share/examples/gmt/ex04/job04.bash
-share/examples/gmt/ex04/job4c.csh
+share/examples/gmt/ex04/job04.csh
 share/examples/gmt/ex04/job4c.bash
+share/examples/gmt/ex04/job4c.csh
+share/examples/gmt/ex04/topo.cpt
 share/examples/gmt/ex05/job05.bash
 share/examples/gmt/ex05/job05.csh
-share/examples/gmt/ex06/v3206.t
 share/examples/gmt/ex06/fractures.d
-share/examples/gmt/ex06/job06.csh
 share/examples/gmt/ex06/job06.bash
-share/examples/gmt/ex07/quakes.xym
-share/examples/gmt/ex07/isochron.xy
+share/examples/gmt/ex06/job06.csh
+share/examples/gmt/ex06/v3206.t
 share/examples/gmt/ex07/fz.xy
-share/examples/gmt/ex07/ridge.xy
-share/examples/gmt/ex07/job07.csh
+share/examples/gmt/ex07/isochron.xy
 share/examples/gmt/ex07/job07.bash
+share/examples/gmt/ex07/job07.csh
+share/examples/gmt/ex07/quakes.xym
+share/examples/gmt/ex07/ridge.xy
 share/examples/gmt/ex08/guinea_bay.grd
-share/examples/gmt/ex08/job08.csh
 share/examples/gmt/ex08/job08.bash
-share/examples/gmt/ex09/track_d.223.xys
-share/examples/gmt/ex09/track_d.25.xys
-share/examples/gmt/ex09/track_d.251.xys
-share/examples/gmt/ex09/track_d.51.xys
-share/examples/gmt/ex09/track_d.53.xys
-share/examples/gmt/ex09/track_d.79.xys
-share/examples/gmt/ex09/track_d.81.xys
+share/examples/gmt/ex08/job08.csh
+share/examples/gmt/ex09/all.xys
+share/examples/gmt/ex09/fz.xy
+share/examples/gmt/ex09/job09.bash
+share/examples/gmt/ex09/job09.csh
+share/examples/gmt/ex09/ridge.xy
+share/examples/gmt/ex09/track_d.107.xys
 share/examples/gmt/ex09/track_d.109.xys
 share/examples/gmt/ex09/track_d.111.xys
 share/examples/gmt/ex09/track_d.137.xys
@@ -914,10 +913,11 @@ share/examples/gmt/ex09/track_d.193.xys
 share/examples/gmt/ex09/track_d.195.xys
 share/examples/gmt/ex09/track_d.197.xys
 share/examples/gmt/ex09/track_d.21.xys
+share/examples/gmt/ex09/track_d.223.xys
 share/examples/gmt/ex09/track_d.225.xys
 share/examples/gmt/ex09/track_d.23.xys
-share/examples/gmt/ex09/fz.xy
-share/examples/gmt/ex09/all.xys
+share/examples/gmt/ex09/track_d.25.xys
+share/examples/gmt/ex09/track_d.251.xys
 share/examples/gmt/ex09/track_d.253.xys
 share/examples/gmt/ex09/track_d.279.xys
 share/examples/gmt/ex09/track_d.281.xys
@@ -940,46 +940,46 @@ share/examples/gmt/ex09/track_d.455.xys
 share/examples/gmt/ex09/track_d.481.xys
 share/examples/gmt/ex09/track_d.483.xys
 share/examples/gmt/ex09/track_d.49.xys
-share/examples/gmt/ex09/ridge.xy
-share/examples/gmt/ex09/track_d.107.xys
-share/examples/gmt/ex09/job09.csh
-share/examples/gmt/ex09/job09.bash
+share/examples/gmt/ex09/track_d.51.xys
+share/examples/gmt/ex09/track_d.53.xys
+share/examples/gmt/ex09/track_d.79.xys
+share/examples/gmt/ex09/track_d.81.xys
 share/examples/gmt/ex10/agu.d
-share/examples/gmt/ex10/job10.csh
 share/examples/gmt/ex10/job10.bash
-share/examples/gmt/ex11/rgb_cube.awk
+share/examples/gmt/ex10/job10.csh
 share/examples/gmt/ex11/contoured_cube.ps.bz2
 share/examples/gmt/ex11/job11.bash
 share/examples/gmt/ex11/job11.csh
-share/examples/gmt/ex12/table_5.11
+share/examples/gmt/ex11/rgb_cube.awk
 share/examples/gmt/ex12/job12.bash
 share/examples/gmt/ex12/job12.csh
-share/examples/gmt/ex13/job13.csh
+share/examples/gmt/ex12/table_5.11
 share/examples/gmt/ex13/job13.bash
-share/examples/gmt/ex14/table_5.11
+share/examples/gmt/ex13/job13.csh
 share/examples/gmt/ex14/job14.bash
 share/examples/gmt/ex14/job14.csh
-share/examples/gmt/ex15/ship.xyz
+share/examples/gmt/ex14/table_5.11
 share/examples/gmt/ex15/job15.bash
 share/examples/gmt/ex15/job15.csh
-share/examples/gmt/ex16/table_5.11
-share/examples/gmt/ex16/job16.csh
-share/examples/gmt/ex16/job16.bash
+share/examples/gmt/ex15/ship.xyz
 share/examples/gmt/ex16/ex16.cpt
-share/examples/gmt/ex17/job17.csh
-share/examples/gmt/ex17/job17.bash
+share/examples/gmt/ex16/job16.bash
+share/examples/gmt/ex16/job16.csh
+share/examples/gmt/ex16/table_5.11
 share/examples/gmt/ex17/india_geoid.grd
 share/examples/gmt/ex17/india_topo.grd
-share/examples/gmt/ex18/job18.csh
-share/examples/gmt/ex18/job18.bash
+share/examples/gmt/ex17/job17.bash
+share/examples/gmt/ex17/job17.csh
 share/examples/gmt/ex18/AK_gulf_grav.grd
+share/examples/gmt/ex18/job18.bash
+share/examples/gmt/ex18/job18.csh
 share/examples/gmt/ex19/job19.bash
 share/examples/gmt/ex19/job19.csh
+share/examples/gmt/ex20/bullseye.def
 share/examples/gmt/ex20/job20.bash
+share/examples/gmt/ex20/job20.csh
 share/examples/gmt/ex20/make_symbol
 share/examples/gmt/ex20/volcano.def
-share/examples/gmt/ex20/bullseye.def
-share/examples/gmt/ex20/job20.csh
 share/examples/gmt/tutorial/bermuda.grd
 share/examples/gmt/tutorial/data
 share/examples/gmt/tutorial/quakes.cpt