diff --git a/astro/dgpsip/Makefile b/astro/dgpsip/Makefile
index 743280c5c4..1c6af87584 100644
--- a/astro/dgpsip/Makefile
+++ b/astro/dgpsip/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.13 2005/01/08 06:59:25 brad Exp $
+# $OpenBSD: Makefile,v 1.14 2007/09/15 10:37:21 ajacoutot Exp $
 
-COMMENT=	"Differential GPS over IP communication device"
+COMMENT=	Differential GPS over IP communication device
 
 DISTNAME=	dgpsip-1.35
 CATEGORIES=	astro
diff --git a/astro/jday/Makefile b/astro/jday/Makefile
index 9e94dbb044..26c31cc3fd 100644
--- a/astro/jday/Makefile
+++ b/astro/jday/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.10 2006/11/02 21:30:57 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2007/09/15 10:37:21 ajacoutot Exp $
 
-COMMENT=	"astronomical julian date calculator"
+COMMENT=	astronomical julian date calculator
 
 DISTNAME=	jday-2.4
 SHARED_LIBS +=  jday                 0.0      # .2.4
diff --git a/astro/luna/Makefile b/astro/luna/Makefile
index 9967a85ec1..f238da24ba 100644
--- a/astro/luna/Makefile
+++ b/astro/luna/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.6 2004/11/21 12:50:33 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2007/09/15 10:37:21 ajacoutot Exp $
 
-COMMENT=	"display the moon's phase"
+COMMENT=	display the moon's phase
 
 DISTNAME=	luna19s
 PKGNAME=	luna-1.9
@@ -11,10 +11,10 @@ EXTRACT_CASES=	*.lzh) lha xw=${WRKDIR}/${DISTNAME} ${FULLDISTDIR}/$$archive ;;
 
 MAINTAINER=	Nick Nauwelaerts <nick@nauwelaerts.net>
 
-PERMIT_PACKAGE_CDROM=	"copyrighted"
-PERMIT_PACKAGE_FTP=	"copyrighted"
-PERMIT_DISTFILES_CDROM=	"copyrighted"
-PERMIT_DISTFILES_FTP=	"copyrighted"
+PERMIT_PACKAGE_CDROM=	copyrighted
+PERMIT_PACKAGE_FTP=	copyrighted
+PERMIT_DISTFILES_CDROM=	copyrighted
+PERMIT_DISTFILES_FTP=	copyrighted
 WANTLIB=		c
 
 MASTER_SITES=	ftp://ftp.vector.co.jp/pack/dos/edu/science/space/
diff --git a/astro/phoon/Makefile b/astro/phoon/Makefile
index 67f6f2135e..c46726a5f0 100644
--- a/astro/phoon/Makefile
+++ b/astro/phoon/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.4 2006/07/02 11:05:42 steven Exp $
+# $OpenBSD: Makefile,v 1.5 2007/09/15 10:37:21 ajacoutot Exp $
 
-COMMENT=		"displays the phase of the moon in ascii"
+COMMENT=		displays the phase of the moon in ascii
 
 DISTNAME=		phoon_29jun2005
 PKGNAME=		phoon-20050629
diff --git a/astro/py-metar/Makefile b/astro/py-metar/Makefile
index 8a4358db62..a8830d708f 100644
--- a/astro/py-metar/Makefile
+++ b/astro/py-metar/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.7 2006/06/03 09:19:52 alek Exp $
+# $OpenBSD: Makefile,v 1.8 2007/09/15 10:37:21 ajacoutot Exp $
 
-COMMENT=	"Python module to access the NOAA's METAR weather reports"
+COMMENT=	Python module to access the NOAA's METAR weather reports
 
 DISTNAME=	pymetar-0.12
 PKGNAME=	${DISTNAME:S/py/py-/}p0
diff --git a/astro/sattrack/Makefile b/astro/sattrack/Makefile
index 9ce0517f5f..a159f45ff6 100644
--- a/astro/sattrack/Makefile
+++ b/astro/sattrack/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.21 2006/11/06 19:40:32 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2007/09/15 10:37:21 ajacoutot Exp $
 
-COMMENT=	"real-time satellite tracking and orbit propagation program"
+COMMENT=	real-time satellite tracking and orbit propagation program
 DISTNAME=	sattrack-3.1.6
 PKGNAME=	${DISTNAME}p0
 CATEGORIES=	astro
 
-PERMIT_PACKAGE_CDROM=   "May not be bundled, according to copyright."
+PERMIT_PACKAGE_CDROM=   May not be bundled, according to copyright
 PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= "May not be bundled, according to copyright."
+PERMIT_DISTFILES_CDROM= May not be bundled, according to copyright
 PERMIT_DISTFILES_FTP=   Yes
 WANTLIB=		ICE SM X11 Xt c m
 
diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index c9fbf0aa07..66b86cbdd1 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.10 2007/04/05 13:36:40 kili Exp $
+# $OpenBSD: Makefile,v 1.11 2007/09/15 10:37:21 ajacoutot Exp $
 
-COMMENT-main=		"display the phase of the Sun on a map of the Earth"
-COMMENT-maps=		"additional maps of the Earth for sunclock"
+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}
@@ -32,8 +32,8 @@ MULTI_PACKAGES=	 -main
 MULTI_PACKAGES+= -maps
 .endif
 
-PERMIT_PACKAGE_CDROM-maps=	"no license for additional maps"
-PERMIT_PACKAGE_FTP-maps=	"no license for additional maps"
+PERMIT_PACKAGE_CDROM-maps=	no license for additional maps
+PERMIT_PACKAGE_FTP-maps=	no license for additional maps
 RUN_DEPENDS-maps=    ::astro/sunclock
 PKG_ARCH-maps=	*
 
diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile
index c74f74b207..94bcb515d6 100644
--- a/astro/wmglobe/Makefile
+++ b/astro/wmglobe/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.18 2006/10/15 22:10:49 sturm Exp $
+# $OpenBSD: Makefile,v 1.19 2007/09/15 10:37:21 ajacoutot Exp $
 
-COMMENT=		'wm-dockapp; displays the earth on an icon'
+COMMENT=		wm-dockapp; displays the earth on an icon
 
 DISTNAME=		wmglobe-1.3
 PKGNAME=		${DISTNAME}p0
diff --git a/astro/wmmoonclock/Makefile b/astro/wmmoonclock/Makefile
index 936e366f4c..646dda8095 100644
--- a/astro/wmmoonclock/Makefile
+++ b/astro/wmmoonclock/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.17 2006/10/15 22:10:49 sturm Exp $
+# $OpenBSD: Makefile,v 1.18 2007/09/15 10:37:22 ajacoutot Exp $
 
-COMMENT=		'wm-dockapp; shows the moon phase'
+COMMENT=		wm-dockapp; shows the moon phase
 
 DISTNAME=		wmMoonClock-1.27
 PKGNAME=		${DISTNAME:L}p0
diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile
index ca66b34713..89247e2042 100644
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.17 2006/10/15 22:10:49 sturm Exp $
+# $OpenBSD: Makefile,v 1.18 2007/09/15 10:37:22 ajacoutot Exp $
 
-COMMENT=		'wm-dockapp; space weather monitor'
+COMMENT=		wm-dockapp; space weather monitor
 
 DISTNAME=		wmSpaceWeather-1.04
 PKGNAME=		${DISTNAME:L}p0
diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile
index 03ecb1e746..6451b856ed 100644
--- a/astro/wmsun/Makefile
+++ b/astro/wmsun/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.16 2006/10/15 22:10:49 sturm Exp $
+# $OpenBSD: Makefile,v 1.17 2007/09/15 10:37:22 ajacoutot Exp $
 
-COMMENT=		'wm-dockapp; shows sunrise/sunset times'
+COMMENT=		wm-dockapp; shows sunrise/sunset times
 
 DISTNAME=		wmSun-1.03
 PKGNAME=		${DISTNAME:L}p0
diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index 68e8e41390..6eca221fce 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.15 2006/11/13 10:08:12 steven Exp $
+# $OpenBSD: Makefile,v 1.16 2007/09/15 10:37:22 ajacoutot Exp $
 
-COMMENT=	"set the root window to the image of earth"
+COMMENT=	set the root window to the image of earth
 DISTNAME=	xearth-1.1
 CATEGORIES=	astro x11
 MASTER_SITES=	ftp://cag.lcs.mit.edu/pub/tuna/
 
 MAINTAINER=	Paul Janzen <pjanzen@openbsd.org>
 
-PERMIT_PACKAGE_CDROM=   "Cannot sell."
+PERMIT_PACKAGE_CDROM=   Cannot sell
 PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= "Cannot sell."
+PERMIT_DISTFILES_CDROM= Cannot sell
 PERMIT_DISTFILES_FTP=   Yes
 WANTLIB=		ICE SM X11 Xext Xt c m
 
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index cb86d1c9ae..ef46717096 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.29 2006/11/13 10:08:12 steven Exp $
+# $OpenBSD: Makefile,v 1.30 2007/09/15 10:37:22 ajacoutot Exp $
 
-COMMENT=	"interactive astronomical ephemeris"
+COMMENT=	interactive astronomical ephemeris
 DISTNAME=	xephem-3.2.3
 CATEGORIES=	astro
 MASTER_SITES=	http://humppa.nl/distfiles/
 
 HOMEPAGE=	http://www.clearskyinstitute.com/xephem/
 
-PERMIT_PACKAGE_CDROM=   "no modifications, no fee"
-PERMIT_PACKAGE_FTP=     "no modifications"
-PERMIT_DISTFILES_CDROM= "no fee"
+PERMIT_PACKAGE_CDROM=   no modifications, no fee
+PERMIT_PACKAGE_FTP=     no modifications
+PERMIT_DISTFILES_CDROM= no fee
 PERMIT_DISTFILES_FTP=   Yes
 WANTLIB=		ICE SM X11 Xext Xp Xt c m
 
diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index 8150ada707..fe0941ef00 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.16 2006/11/13 10:08:12 steven Exp $
+# $OpenBSD: Makefile,v 1.17 2007/09/15 10:37:22 ajacoutot Exp $
 
-COMMENT=	"set the root window to the moon in its current phase"
+COMMENT=	set the root window to the moon in its current phase
 DISTNAME=	xphoon
 PKGNAME=	xphoon-91.9.18
 CATEGORIES=	astro x11
 MASTER_SITES=	${MASTER_SITE_R5CONTRIB}
 EXTRACT_SUFX=	.tar.Z
 
-PERMIT_PACKAGE_CDROM=   "Cannot sell."
+PERMIT_PACKAGE_CDROM=   Cannot sell
 PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= "Cannot sell."
+PERMIT_DISTFILES_CDROM= Cannot sell
 PERMIT_DISTFILES_FTP=   Yes
 WANTLIB=		X11 Xext c m
 
diff --git a/astro/xworld/Makefile b/astro/xworld/Makefile
index 585f005081..a7318e8860 100644
--- a/astro/xworld/Makefile
+++ b/astro/xworld/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.7 2007/08/01 19:36:14 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2007/09/15 10:37:22 ajacoutot Exp $
 
-COMMENT=	"earth as seen from the direction of the sun"
+COMMENT=	earth as seen from the direction of the sun
 
 DISTNAME=	xworld-2.0
 CATEGORIES=	astro x11