diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile
index f6d35a56949..088c9691df3 100644
--- a/graphics/gmt/Makefile
+++ b/graphics/gmt/Makefile
@@ -1,10 +1,14 @@
-# $OpenBSD: Makefile,v 1.10 2008/09/10 22:01:04 martynas Exp $
+# $OpenBSD: Makefile,v 1.11 2008/10/30 16:48:37 naddy Exp $
 
-COMMENT=		draw maps and charts
+COMMENT-main=		draw maps and charts
+COMMENT-high=		high resolution coastline data for GMT
+COMMENT-full=		full resolution coastline data for GMT
 
 V=			4.1.3
-DISTNAME=		GMT${V}
-PKGNAME=		gmt-${V}p1
+DISTNAME=		GMT$V
+PKGNAME-main=		gmt-$Vp2
+PKGNAME-high=		gmt-high-$V
+PKGNAME-full=		gmt-full-$V
 CATEGORIES=		graphics geo
 
 HOMEPAGE=		http://gmt.soest.hawaii.edu/
@@ -17,44 +21,36 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-LIB_DEPENDS=		netcdf.>=1::math/netcdf
-
-WANTLIB=		c m
-
 MASTER_SITES=		ftp://ftp.soest.hawaii.edu/gmt/4/ \
 			ftp://falcon.grdl.noaa.gov/pub/gmt/4/ \
 			ftp://ftp.iris.washington.edu/pub/gmt/4/ \
 			ftp://ftp.geologi.uio.no/pub/gmt/4/ \
 			ftp://gd.tuwien.ac.at/pub/gmt/4/
 			
-DISTFILES=		GMT${V}_src.tar.bz2 \
-			GMT${V}_man.tar.bz2 \
-			GMT${V}_share.tar.bz2 \
-			GMT4.1_coast.tar.bz2
-
-SUPDISTFILES=		GMT4.1_high.tar.bz2 \
+DISTFILES=		GMT$V_src.tar.bz2 \
+			GMT$V_man.tar.bz2 \
+			GMT$V_share.tar.bz2 \
+			GMT4.1_coast.tar.bz2 \
+			GMT4.1_high.tar.bz2 \
 			GMT4.1_full.tar.bz2
 
 EXTRACT_CASES=		GMT4.1_*.tar.bz2) bzip2 -dc ${FULLDISTDIR}/$$archive | \
 				tar xf - -C ${WRKDIST};;
 
+MULTI_PACKAGES=		-main -high -full
+
+LIB_DEPENDS-main=	netcdf.>=1::math/netcdf
+WANTLIB-main=		c m
+
+RUN_DEPENDS-high=	:gmt-$V:graphics/gmt
+RUN_DEPENDS-full=	:gmt-$V:graphics/gmt
+
 CONFIGURE_STYLE=	gnu
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/gmt/share \
 			--enable-mansect=1 \
 			--enable-netcdf=${LOCALBASE}
 
-
-FLAVORS=		high full
-FLAVOR?=
-
-.if ${FLAVOR:L:Mhigh}
-DISTFILES+=		GMT4.1_high.tar.bz2
-.endif
-.if ${FLAVOR:L:Mfull}
-DISTFILES+=		GMT4.1_full.tar.bz2
-.endif
-
 NO_REGRESS=		Yes
 
 ALL_TARGET=		gmt
diff --git a/graphics/gmt/pkg/DESCR b/graphics/gmt/pkg/DESCR-full
similarity index 82%
rename from graphics/gmt/pkg/DESCR
rename to graphics/gmt/pkg/DESCR-full
index f2ff5f979ca..8f34dd7abf0 100644
--- a/graphics/gmt/pkg/DESCR
+++ b/graphics/gmt/pkg/DESCR-full
@@ -6,7 +6,4 @@ illuminated surfaces and 3-D perspective views. GMT supports ~30 map
 projections and transformations and comes with support data such as
 coastlines, rivers, and political boundaries.
 
-Flavors:
-	high: adds high resolution coastline data
-
-	full: adds full resolution coastline data
+This package adds full resolution coastline data to GMT.
diff --git a/graphics/gmt/pkg/DESCR-high b/graphics/gmt/pkg/DESCR-high
new file mode 100644
index 00000000000..6fcb20b7a0b
--- /dev/null
+++ b/graphics/gmt/pkg/DESCR-high
@@ -0,0 +1,9 @@
+GMT is an open source collection of ~60 tools for manipulating
+geographic and Cartesian data sets (including filtering, trend fitting,
+gridding, projecting, etc.) and producing PostScript illustrations
+ranging from simple x-y plots via contour maps to artificially
+illuminated surfaces and 3-D perspective views. GMT supports ~30 map
+projections and transformations and comes with support data such as
+coastlines, rivers, and political boundaries.
+
+This package adds high resolution coastline data to GMT.
diff --git a/graphics/gmt/pkg/DESCR-main b/graphics/gmt/pkg/DESCR-main
new file mode 100644
index 00000000000..e64319167d8
--- /dev/null
+++ b/graphics/gmt/pkg/DESCR-main
@@ -0,0 +1,7 @@
+GMT is an open source collection of ~60 tools for manipulating
+geographic and Cartesian data sets (including filtering, trend fitting,
+gridding, projecting, etc.) and producing PostScript illustrations
+ranging from simple x-y plots via contour maps to artificially
+illuminated surfaces and 3-D perspective views. GMT supports ~30 map
+projections and transformations and comes with support data such as
+coastlines, rivers, and political boundaries.
diff --git a/graphics/gmt/pkg/PFRAG.full b/graphics/gmt/pkg/PLIST-full
similarity index 56%
rename from graphics/gmt/pkg/PFRAG.full
rename to graphics/gmt/pkg/PLIST-full
index ff884be975c..be087d08c63 100644
--- a/graphics/gmt/pkg/PFRAG.full
+++ b/graphics/gmt/pkg/PLIST-full
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.full,v 1.2 2006/06/01 04:04:45 steven Exp $
+@comment $OpenBSD: PLIST-full,v 1.1 2008/10/30 16:48:37 naddy Exp $
+@pkgpath graphics/gmt,full
 share/gmt/share/coast/binned_GSHHS_f.cdf
 share/gmt/share/coast/binned_border_f.cdf
 share/gmt/share/coast/binned_river_f.cdf
diff --git a/graphics/gmt/pkg/PFRAG.high b/graphics/gmt/pkg/PLIST-high
similarity index 56%
rename from graphics/gmt/pkg/PFRAG.high
rename to graphics/gmt/pkg/PLIST-high
index 9d937ac4975..e18c246373f 100644
--- a/graphics/gmt/pkg/PFRAG.high
+++ b/graphics/gmt/pkg/PLIST-high
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.high,v 1.2 2006/06/01 04:04:45 steven Exp $
+@comment $OpenBSD: PLIST-high,v 1.1 2008/10/30 16:48:37 naddy Exp $
+@pkgpath graphics/gmt,high
 share/gmt/share/coast/binned_GSHHS_h.cdf
 share/gmt/share/coast/binned_border_h.cdf
 share/gmt/share/coast/binned_river_h.cdf
diff --git a/graphics/gmt/pkg/PLIST b/graphics/gmt/pkg/PLIST-main
similarity index 99%
rename from graphics/gmt/pkg/PLIST
rename to graphics/gmt/pkg/PLIST-main
index ba4a0a2456d..31dfd676a9d 100644
--- a/graphics/gmt/pkg/PLIST
+++ b/graphics/gmt/pkg/PLIST-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2008/07/30 17:14:37 martynas Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2008/10/30 16:48:37 naddy Exp $
+@pkgpath graphics/gmt
 bin/GMT
 @bin bin/blockmean
 @bin bin/blockmedian
@@ -186,8 +187,6 @@ share/gmt/share/coast/binned_border_l.cdf
 share/gmt/share/coast/binned_river_c.cdf
 share/gmt/share/coast/binned_river_i.cdf
 share/gmt/share/coast/binned_river_l.cdf
-%%full%%
-%%high%%
 share/gmt/share/cpt/
 share/gmt/share/cpt/GMT_cool.cpt
 share/gmt/share/cpt/GMT_copper.cpt