diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 42460a6ed80..bd7e1ca80a5 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.16 2009/12/21 18:05:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2010/07/11 16:01:51 espie Exp $
 
 COMMENT=	free space simulator and planetarium
 
 DISTNAME=	celestia-1.6.0
-PKGNAME=	${DISTNAME}p3
 CATEGORIES=	astro x11
 
 HOMEPAGE=	http://www.shatters.net/celestia/
@@ -18,6 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=celestia/}
 
+REVISION =	3
 WANTLIB += GL GLU ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
 WANTLIB += Xext Xfixes Xi Xinerama Xmu Xrandr Xrender Xt atk-1.0
 WANTLIB += c cairo expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
diff --git a/astro/sattrack/Makefile b/astro/sattrack/Makefile
index b81c7f02481..30160277f07 100644
--- a/astro/sattrack/Makefile
+++ b/astro/sattrack/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.26 2009/08/10 06:29:51 kili Exp $
+# $OpenBSD: Makefile,v 1.27 2010/07/11 16:01:51 espie Exp $
 
 V=		3.1.6
 COMMENT=	real-time satellite tracking and orbit propagation program
 DISTNAME=	sattrack-${V}
-PKGNAME=	${DISTNAME}p3
 CATEGORIES=	astro
 
 # Commercial License
@@ -12,6 +11,7 @@ PERMIT_PACKAGE_FTP=	May not distribute modified version
 PERMIT_DISTFILES_CDROM=	May not be bundled, according to copyright
 PERMIT_DISTFILES_FTP=	Yes
 
+REVISION =	3
 WANTLIB=	ICE SM X11 Xt c m pthread-stubs xcb
 
 FAKE_FLAGS=	PREFIX=${WRKINST}${PREFIX}
diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index d37421d6178..264089e66e9 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.14 2009/08/10 06:29:51 kili Exp $
+# $OpenBSD: Makefile,v 1.15 2010/07/11 16:01:51 espie Exp $
 
 COMMENT-main=		display the phase of the Sun on a map of the Earth
 COMMENT-maps=		additional maps of the Earth for sunclock
 
 VERSION=		3.56
 DISTNAME=		sunclock-${VERSION}
-PKGNAME-main=		${DISTNAME}p2
-PKGNAME-maps=		sunclock-maps-${VERSION}p0
+PKGNAME-main=		${DISTNAME}
+PKGNAME-maps=		sunclock-maps-${VERSION}
 CATEGORIES=		astro
 
 HOMEPAGE=		http://www.arvernes.com/wiki/index.php/Sunclock
@@ -43,6 +43,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+REVISION-main =	2
+REVISION-maps = 0
 WANTLIB-main=		X11 Xext Xpm Xau Xdmcp c m pthread-stubs xcb z
 DIST_SUBDIR=		sunclock
 
diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile
index 287c54e5ccc..9d8d5c26b50 100644
--- a/astro/wmglobe/Makefile
+++ b/astro/wmglobe/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.20 2009/08/10 06:29:51 kili Exp $
+# $OpenBSD: Makefile,v 1.21 2010/07/11 16:01:51 espie Exp $
 
 COMMENT=		wm-dockapp; displays the earth on an icon
 
 DISTNAME=		wmglobe-1.3
-PKGNAME=		${DISTNAME}p1
 CATEGORIES=		astro x11 x11/windowmaker
 
 HOMEPAGE=		http://hamete.org/static/wmg/
@@ -15,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+
+REVISION =	1
 WANTLIB=		X11 Xext Xpm c m pthread-stubs xcb z
 
 MASTER_SITES=		${HOMEPAGE}
diff --git a/astro/wmmoonclock/Makefile b/astro/wmmoonclock/Makefile
index e612a835c20..27ed1684c98 100644
--- a/astro/wmmoonclock/Makefile
+++ b/astro/wmmoonclock/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2009/09/10 22:17:52 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2010/07/11 16:01:51 espie Exp $
 
 COMMENT=		wm-dockapp; shows the moon phase
 
 DISTNAME=		wmMoonClock-1.27
-PKGNAME=		${DISTNAME:L}p2
+PKGNAME=		${DISTNAME:L}
 CATEGORIES=		astro x11 x11/windowmaker
 
 MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+REVISION =	2
 WANTLIB=		X11 Xext Xpm c m pthread-stubs xcb
 
 MASTER_SITES=		http://www.phil.uu.nl/~lievisse/distfiles/
diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile
index aacd0a59bab..22dd09c31c3 100644
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2009/09/10 22:17:52 jasper Exp $
+# $OpenBSD: Makefile,v 1.23 2010/07/11 16:01:51 espie Exp $
 
 COMMENT=		wm-dockapp; space weather monitor
 
 DISTNAME=		wmSpaceWeather-1.04
-PKGNAME=		${DISTNAME:L}p3
+PKGNAME=		${DISTNAME:L}
 CATEGORIES=		astro x11 x11/windowmaker
 
 MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+REVISION =	3
 WANTLIB=		X11 Xext Xpm c pthread-stubs xcb
 
 MASTER_SITES=		http://www.phil.uu.nl/~lievisse/distfiles/
diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile
index d49597d7940..621df6b7df4 100644
--- a/astro/wmsun/Makefile
+++ b/astro/wmsun/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2009/09/10 22:17:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.21 2010/07/11 16:01:51 espie Exp $
 
 COMMENT=		wm-dockapp; shows sunrise/sunset times
 
 DISTNAME=		wmSun-1.03
-PKGNAME=		${DISTNAME:L}p2
+PKGNAME=		${DISTNAME:L}
 CATEGORIES=		astro x11 x11/windowmaker
 
 MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+REVISION =	2
 WANTLIB=		X11 Xext Xpm c m pthread-stubs xcb
 
 MASTER_SITES=		http://www.phil.uu.nl/~lievisse/distfiles/
diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index 0ba3c591bad..5e92b74fa47 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.20 2009/08/10 06:29:52 kili Exp $
+# $OpenBSD: Makefile,v 1.21 2010/07/11 16:01:51 espie Exp $
 
 COMMENT=	set the root window to the image of earth
 DISTNAME=	xearth-1.1
-PKGNAME=	${DISTNAME}p2
 CATEGORIES=	astro x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 
@@ -12,6 +11,8 @@ PERMIT_PACKAGE_CDROM=   Cannot sell
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Cannot sell
 PERMIT_DISTFILES_FTP=   Yes
+
+REVISION =	2
 WANTLIB=		ICE SM X11 Xau Xdmcp Xext Xt c m \
 			pthread-stubs xcb
 
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 811909e6ec4..77b00f70880 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.36 2010/04/24 20:18:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.37 2010/07/11 16:01:51 espie Exp $
 
 COMMENT=	interactive astronomical ephemeris
 DISTNAME=	xephem-3.2.3
-PKGNAME=	${DISTNAME}p2
 CATEGORIES=	astro
 MASTER_SITES=	http://www.phil.uu.nl/~lievisse/distfiles/
 
@@ -12,6 +11,8 @@ PERMIT_PACKAGE_CDROM=   no modifications, no fee
 PERMIT_PACKAGE_FTP=     no modifications
 PERMIT_DISTFILES_CDROM= no fee
 PERMIT_DISTFILES_FTP=   Yes
+
+REVISION =	2
 WANTLIB=		ICE SM X11 Xau Xdmcp Xext Xt c m \
 			pthread-stubs xcb
 
diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index 4a7548835d7..c583bc65685 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.21 2009/08/10 06:29:52 kili Exp $
+# $OpenBSD: Makefile,v 1.22 2010/07/11 16:01:51 espie Exp $
 
 COMMENT=	set the root window to the moon in its current phase
 DISTNAME=	xphoon
-PKGNAME=	xphoon-91.9.18p3
+PKGNAME=	xphoon-91.9.18
 CATEGORIES=	astro x11
 
 HOMEPAGE=	http://xphoon.sourceforge.net/
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Cannot sell
 PERMIT_DISTFILES_FTP=   Yes
 
+REVISION =	3
 WANTLIB=	X11 Xau Xdmcp Xext c m pthread-stubs xcb
 
 CONFIGURE_STYLE= imake
diff --git a/astro/xworld/Makefile b/astro/xworld/Makefile
index 54486e0602f..8b9ecc4d14f 100644
--- a/astro/xworld/Makefile
+++ b/astro/xworld/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2009/08/10 06:29:52 kili Exp $
+# $OpenBSD: Makefile,v 1.11 2010/07/11 16:01:51 espie Exp $
 
 COMMENT=	earth as seen from the direction of the sun
 
 DISTNAME=	xworld-2.0
-PKGNAME=	${DISTNAME}p0
 CATEGORIES=	astro x11
 
 MAINTAINER=	Vladimir Kotal <vlada@openbsd.cz>
@@ -16,7 +15,8 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB=		X11 c m pthread-stubs xcb
+REVISION =	0
+WANTLIB=	X11 c m pthread-stubs xcb
 
 USE_X11=	Yes