Index: head/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile
===================================================================
--- head/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile	(revision 443502)
+++ head/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile	(revision 443503)
@@ -1,13 +1,13 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTREVISION=	5
 
-FLAVOR=		cryogenic
+THEME_FLAVOR=	cryogenic
 
 MASTERDIR=	${.CURDIR}/../gtk-aluminumalloy-volcanic-theme
 
 DISTINFO_FILE=	${.CURDIR}/../gtk-aluminumalloy-cryogenic-theme/distinfo
 PLIST=		${.CURDIR}/../gtk-aluminumalloy-cryogenic-theme/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
Index: head/x11-themes/gtk-aluminumalloy-smog-theme/Makefile
===================================================================
--- head/x11-themes/gtk-aluminumalloy-smog-theme/Makefile	(revision 443502)
+++ head/x11-themes/gtk-aluminumalloy-smog-theme/Makefile	(revision 443503)
@@ -1,13 +1,13 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTREVISION=	5
 
-FLAVOR=		smog
+THEME_FLAVOR=	smog
 
 MASTERDIR=	${.CURDIR}/../gtk-aluminumalloy-volcanic-theme
 
 DISTINFO_FILE=	${.CURDIR}/../gtk-aluminumalloy-smog-theme/distinfo
 PLIST=		${.CURDIR}/../gtk-aluminumalloy-smog-theme/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
Index: head/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile
===================================================================
--- head/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile	(revision 443502)
+++ head/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile	(revision 443503)
@@ -1,13 +1,13 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTREVISION=	5
 
-FLAVOR=		toxic
+THEME_FLAVOR=	toxic
 
 MASTERDIR=	${.CURDIR}/../gtk-aluminumalloy-volcanic-theme
 
 DISTINFO_FILE=	${.CURDIR}/../gtk-aluminumalloy-toxic-theme/distinfo
 PLIST=		${.CURDIR}/../gtk-aluminumalloy-toxic-theme/pkg-plist
 
 .include "${MASTERDIR}/Makefile"
Index: head/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
===================================================================
--- head/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile	(revision 443502)
+++ head/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile	(revision 443503)
@@ -1,45 +1,45 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	aluminumalloy
 PORTVERSION?=	2004.01.04
 PORTREVISION?=	8
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://www.users.monornet.hu/linux/gtk2/oldies/
 PKGNAMEPREFIX?=	${TYPE}-
-PKGNAMESUFFIX?=	-${FLAVOR}-theme
-DISTNAME=	aa_${FLAVOR}
+PKGNAMESUFFIX?=	-${THEME_FLAVOR}-theme
+DISTNAME=	aa_${THEME_FLAVOR}
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	Port of Mac OS X theme Aluminum Alloy (${FLAVOR} flavor)
+COMMENT=	Port of Mac OS X theme Aluminum Alloy (${THEME_FLAVOR} flavor)
 
 TYPE?=		gtk
-FLAVOR?=	volcanic
+THEME_FLAVOR?=	volcanic
 
-THEME_NAME=	AluminumAlloy-${FLAVOR:tu:C/^(.).*$/\1/g}${FLAVOR:C/^(.)//}
+THEME_NAME=	AluminumAlloy-${THEME_FLAVOR:tu:C/^(.).*$/\1/g}${THEME_FLAVOR:C/^(.)//}
 WRKSRC=		${WRKDIR}/${THEME_NAME}
 
 USES=	tar:bzip2
 NO_BUILD=	yes
 
 .if ${TYPE} == gtk
 THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="" METACITY="@comment "
 USE_GNOME=	gtk20
 .else	# metacity
 THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK20="@comment " METACITY=""
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${THEME_DIR}
 .if ${TYPE} == "gtk"
 	cd ${WRKSRC} && ${FIND} gtk-2.0 -name '*[^~]' | \
 		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${THEME_DIR}
 	${INSTALL_DATA} ${WRKSRC}/index.theme ${STAGEDIR}${THEME_DIR}
 .else
 	cd ${WRKSRC} && ${FIND} metacity-1 -name '*[^~]' | \
 		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${THEME_DIR}
 .endif
 
 .include <bsd.port.mk>