@@ -, +, @@ 
    graphics/gimp-app: use canonical name for AALIB option
--- graphics/gimp-app/Makefile	
+++ graphics/gimp-app/Makefile	
@@ -83,9 +83,9 @@ PLIST_SUB+=	LIBVER=0.1000.${PORTVERSION:E}
 
 USES+=		desktop-file-utils
 
-OPTIONS_DEFINE?=	AA GHOSTSCRIPT \
+OPTIONS_DEFINE?=	AALIB GHOSTSCRIPT \
 			LIBHEIF LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
-OPTIONS_DEFAULT=	AA LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
+OPTIONS_DEFAULT=	AALIB LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
 OPTIONS_SUB=		yes
 
 .endif
@@ -102,9 +102,9 @@ LIB_DEPENDS+=	libgimp-2.0.so:graphics/gimp-app
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 
-AA_DESC=		Ascii-art Plug-in
-AA_LIB_DEPENDS=		libaa.so:graphics/aalib
-AA_CONFIGURE_WITH=	aa
+AALIB_DESC=		Ascii-art Plug-in
+AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
+AALIB_CONFIGURE_WITH=	aa
 
 LIBHEIF_DESC=		ISO/IEC 23008-12:2017 HEIF file format support
 LIBHEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
--- graphics/gimp-app/pkg-plist	
+++ graphics/gimp-app/pkg-plist	
@@ -309,7 +309,7 @@ libexec/gimp/2.2/plug-ins/despeckle/despeckle
 libexec/gimp/2.2/plug-ins/destripe/destripe
 libexec/gimp/2.2/plug-ins/edge-dog/edge-dog
 libexec/gimp/2.2/plug-ins/emboss/emboss
-%%AA%%libexec/gimp/2.2/plug-ins/file-aa/file-aa
+%%AALIB%%libexec/gimp/2.2/plug-ins/file-aa/file-aa
 libexec/gimp/2.2/plug-ins/file-bmp/file-bmp
 libexec/gimp/2.2/plug-ins/file-cel/file-cel
 libexec/gimp/2.2/plug-ins/file-compressor/file-compressor