diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 639772b5cf4f..1ddff5c955e8 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -1,139 +1,137 @@
 # New ports collection makefile for:	allegro
 # Date created:		23-Feb-2001
 # Whom:			Jimmy Olgeni <olgeni@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	allegro
 DISTVERSION=	4.2.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	A cross-platform library for games and multimedia programming
 
+USE_AUTOTOOLS=	autoconf:259
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 USE_XLIB=	yes
 WANT_GNOME=	yes
 
-USE_AUTOTOOLS=	autoconf:259
-
-.include "Makefile.man"
-
-INFO=		allegro
-
 OPTIONS=	ARTS "Enable Arts support" off \
-		DEBUG_LIB "Build debugging library" off \
-		DEV_UTILS "Build development utilities" on \
+		DEBUG "Build debugging library" off \
+		DEVEL "Build development utilities" on \
 		ESOUND "Enable Esound support" off \
 		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		PROFILE_LIB "Build profiling library" off \
+		PROFILE "Build profiling library" off \
 		THREADS "Enable threads" on
 
 MAKEFILE=	makefile
 ALL_TARGET=	full-build
 
+.include "Makefile.man"
+
+INFO=		allegro
+
 INSTALLS_SHLIB=	yes
 SHLIB_VER=	42
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 DEMO=		demo.c demo.dat demo.h music.txt ../readme.txt
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-include-allegro-inline-fmaths.in
 .endif
 
-.if defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so.0)
+.if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-CONFIGURE_ARGS+=	--enable-artsdigi
+CONFIGURE_ARGS+=--enable-artsdigi
 PLIST_SUB+=	ARTS=""
 .else
-CONFIGURE_ARGS+=	--disable-artsdigi
+CONFIGURE_ARGS+=--disable-artsdigi
 PLIST_SUB+=	ARTS="@comment "
 .endif
 
-.if defined(WITH_DEBUG_LIB)
-CONFIGURE_ARGS+=	--enable-dbglib
-PLIST_SUB+=	DEBUG_LIB=""
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--enable-dbglib
+PLIST_SUB+=	DEBUG=""
 .else
-CONFIGURE_ARGS+=	--disable-dbglib
-PLIST_SUB+=	DEBUG_LIB="@comment "
+CONFIGURE_ARGS+=--disable-dbglib
+PLIST_SUB+=	DEBUG="@comment "
 .endif
 
-.if !defined(WITHOUT_DEV_UTILS)
+.if !defined(WITHOUT_DEVEL)
 INSTALL_TARGET=	full-install install-man install-info
-PLIST_SUB+=	DEV_UTILS=""
+PLIST_SUB+=	DEVEL=""
 .else
 INSTALL_TARGET=	mini-install install-man install-info
-PLIST_SUB+=	DEV_UTILS="@comment "
+PLIST_SUB+=	DEVEL="@comment "
 .endif
 
-.if defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!=""
+.if defined(WITH_ESOUND)
 USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--enable-esddigi
+CONFIGURE_ARGS+=--enable-esddigi
 PLIST_SUB+=	ESOUND=""
 .else
-CONFIGURE_ARGS+=	--disable-esddigi
+CONFIGURE_ARGS+=--disable-esddigi
 PLIST_SUB+=	ESOUND="@comment "
 .endif
 
-.if defined(WITH_PROFILE_LIB)
-CONFIGURE_ARGS+=	--enable-proflib
-PLIST_SUB+=	PROFILE_LIB=""
+.if defined(WITH_PROFILE)
+CONFIGURE_ARGS+=--enable-proflib
+PLIST_SUB+=	PROFILE=""
 .else
-CONFIGURE_ARGS+=	--disable-proflib
-PLIST_SUB+=	PROFILE_LIB="@comment "
+CONFIGURE_ARGS+=--disable-proflib
+PLIST_SUB+=	PROFILE="@comment "
 .endif
 
 .if !defined(WITHOUT_THREADS)
-CONFIGURE_ARGS+=	--enable-pthreads
+CONFIGURE_ARGS+=--enable-pthreads
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
 		LDFLAGS="${PTHREAD_LIBS}"
 .else
-CONFIGURE_ARGS+=	--disable-pthreads
+CONFIGURE_ARGS+=--disable-pthreads
 .endif
 
 post-patch:
 # Change "x.y.z" into "xy" in the shared library version.
 	@${REINPLACE_CMD} -e 's|${PORTVERSION}|${SHLIB_VER}|g' \
 		${WRKSRC}/makefile.ver
 
 # Remove architecture specific optimizations.
 	@${REINPLACE_CMD} -e 's|$$TARGET_ARCH||g' \
 		${CONFIGURE_WRKSRC}/configure.in
 
 # Remove "-ffast-math" flag on alpha, because it breaks.
 .if ${ARCH} == "alpha"
 	@${REINPLACE_CMD} -e 's|-ffast-math||g' \
 		${CONFIGURE_WRKSRC}/configure.in
 .endif
 
 # Enable/disable compilation optimizations.
 .if defined(WITHOUT_OPTIMIZED_CFLAGS)
 	@${REINPLACE_CMD} -e 's|-O2||g ; \
 		s|-ffast-math||g ; \
 		s|-fomit-frame-pointer||g ; \
 		s|-funroll-loops||g' \
-			${CONFIGURE_WRKSRC}/configure.in
+		${CONFIGURE_WRKSRC}/configure.in
 .endif
 
 post-install:
 # Documentation.
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/*.css  ${DOCSDIR}
 
 # Examples.
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
 .   for f in ${DEMO}
 	${INSTALL_DATA} ${WRKSRC}/demo/${f} ${EXAMPLESDIR}
 .   endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/allegro-devel/pkg-plist b/devel/allegro-devel/pkg-plist
index 03f636bedefc..79155906def8 100644
--- a/devel/allegro-devel/pkg-plist
+++ b/devel/allegro-devel/pkg-plist
@@ -1,196 +1,196 @@
 bin/allegro-config
-%%DEV_UTILS%%bin/colormap
-%%DEV_UTILS%%bin/dat
-%%DEV_UTILS%%bin/dat2c
-%%DEV_UTILS%%bin/dat2s
-%%DEV_UTILS%%bin/exedat
-%%DEV_UTILS%%bin/grabber
-%%DEV_UTILS%%bin/pack
-%%DEV_UTILS%%bin/pat2dat
-%%DEV_UTILS%%bin/rgbmap
-%%DEV_UTILS%%bin/textconv
+%%DEVEL%%bin/colormap
+%%DEVEL%%bin/dat
+%%DEVEL%%bin/dat2c
+%%DEVEL%%bin/dat2s
+%%DEVEL%%bin/exedat
+%%DEVEL%%bin/grabber
+%%DEVEL%%bin/pack
+%%DEVEL%%bin/pat2dat
+%%DEVEL%%bin/rgbmap
+%%DEVEL%%bin/textconv
 include/allegro.h
 include/allegro/3d.h
 include/allegro/3dmaths.h
 include/allegro/alcompat.h
 include/allegro/alinline.h
 include/allegro/alunixac.h
 include/allegro/base.h
 include/allegro/color.h
 include/allegro/compiled.h
 include/allegro/config.h
 include/allegro/datafile.h
 include/allegro/debug.h
 include/allegro/digi.h
 include/allegro/draw.h
 include/allegro/file.h
 include/allegro/fix.h
 include/allegro/fixed.h
 include/allegro/fli.h
 include/allegro/fmaths.h
 include/allegro/font.h
 include/allegro/gfx.h
 include/allegro/graphics.h
 include/allegro/gui.h
 include/allegro/inline/3dmaths.inl
 include/allegro/inline/asm.inl
 include/allegro/inline/color.inl
 include/allegro/inline/draw.inl
 include/allegro/inline/file.inl
 include/allegro/inline/fix.inl
 include/allegro/inline/fmaths.inl
 include/allegro/inline/gfx.inl
 include/allegro/inline/matrix.inl
 include/allegro/inline/rle.inl
 include/allegro/inline/system.inl
 include/allegro/internal/aintern.h
 include/allegro/internal/aintvga.h
 include/allegro/internal/alconfig.h
 include/allegro/joystick.h
 include/allegro/keyboard.h
 include/allegro/lzss.h
 include/allegro/matrix.h
 include/allegro/midi.h
 include/allegro/mouse.h
 include/allegro/palette.h
 include/allegro/platform/aintbeos.h
 include/allegro/platform/aintdos.h
 include/allegro/platform/aintlnx.h
 include/allegro/platform/aintmac.h
 include/allegro/platform/aintosx.h
 include/allegro/platform/aintqnx.h
 include/allegro/platform/aintunix.h
 include/allegro/platform/aintwin.h
 include/allegro/platform/al386gcc.h
 include/allegro/platform/al386vc.h
 include/allegro/platform/al386wat.h
 include/allegro/platform/albcc32.h
 include/allegro/platform/albecfg.h
 include/allegro/platform/albeos.h
 include/allegro/platform/aldjgpp.h
 include/allegro/platform/aldos.h
 include/allegro/platform/almac.h
 include/allegro/platform/almaccfg.h
 include/allegro/platform/almngw32.h
 include/allegro/platform/almsvc.h
 include/allegro/platform/alosx.h
 include/allegro/platform/alosxcfg.h
 include/allegro/platform/alplatf.h
 include/allegro/platform/alqnx.h
 include/allegro/platform/alqnxcfg.h
 include/allegro/platform/alucfg.h
 include/allegro/platform/alunix.h
 include/allegro/platform/alunixac.h
 include/allegro/platform/alwatcom.h
 include/allegro/platform/alwin.h
 include/allegro/platform/astdint.h
 include/allegro/platform/macdef.h
 include/allegro/quat.h
 include/allegro/rle.h
 include/allegro/sound.h
 include/allegro/stream.h
 include/allegro/system.h
 include/allegro/text.h
 include/allegro/timer.h
 include/allegro/unicode.h
 include/linalleg.h
 include/xalleg.h
 %%ARTS%%lib/allegro/%%SHLIB_VER%%/alleg-artsdigi.so
 lib/allegro/%%SHLIB_VER%%/alleg-dga2.so
 %%ESOUND%%lib/allegro/%%SHLIB_VER%%/alleg-esddigi.so
 lib/allegro/%%SHLIB_VER%%/modules.lst
-%%DEBUG_LIB%%lib/liballd.so
-%%DEBUG_LIB%%lib/liballd.so.%%SHLIB_VER%%
-%%DEBUG_LIB%%lib/liballd_unsharable.a
+%%DEBUG%%lib/liballd.so
+%%DEBUG%%lib/liballd.so.%%SHLIB_VER%%
+%%DEBUG%%lib/liballd_unsharable.a
 lib/liballeg.so
 lib/liballeg.so.%%SHLIB_VER%%
 lib/liballeg_unsharable.a
-%%PROFILE_LIB%%lib/liballp.so
-%%PROFILE_LIB%%lib/liballp.so.%%SHLIB_VER%%
-%%PROFILE_LIB%%lib/liballp_unsharable.a
+%%PROFILE%%lib/liballp.so
+%%PROFILE%%lib/liballp.so.%%SHLIB_VER%%
+%%PROFILE%%lib/liballp_unsharable.a
 share/aclocal/allegro.m4
 %%PORTDOCS%%%%DOCSDIR%%/abi.html
 %%PORTDOCS%%%%DOCSDIR%%/ahack.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg000.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg001.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg002.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg003.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg004.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg005.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg006.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg007.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg008.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg009.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg010.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg011.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg012.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg013.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg014.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg015.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg016.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg017.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg018.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg019.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg020.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg021.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg022.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg023.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg024.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg025.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg026.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg027.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg028.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg029.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg030.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg031.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg032.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg033.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg034.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg035.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg036.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg037.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg038.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg039.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg040.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg041.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg042.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg043.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg044.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg045.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg046.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg047.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg048.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg049.html
 %%PORTDOCS%%%%DOCSDIR%%/allegro.css
 %%PORTDOCS%%%%DOCSDIR%%/allegro.html
 %%PORTDOCS%%%%DOCSDIR%%/api.html
 %%PORTDOCS%%%%DOCSDIR%%/changes.html
 %%PORTDOCS%%%%DOCSDIR%%/const.html
 %%PORTDOCS%%%%DOCSDIR%%/dat.html
 %%PORTDOCS%%%%DOCSDIR%%/dat2c.html
 %%PORTDOCS%%%%DOCSDIR%%/dat2s.html
 %%PORTDOCS%%%%DOCSDIR%%/datafile.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/grabber.html
 %%PORTDOCS%%%%DOCSDIR%%/help.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/license.html
 %%PORTDOCS%%%%DOCSDIR%%/makedoc.html
 %%PORTDOCS%%%%DOCSDIR%%/mistakes.html
 %%PORTDOCS%%%%DOCSDIR%%/packfile.html
 %%PORTDOCS%%%%DOCSDIR%%/readme.html
 %%PORTDOCS%%%%DOCSDIR%%/thanks.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/music.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/readme.txt
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/allegro/%%SHLIB_VER%%
 @dirrm lib/allegro
 @dirrm include/allegro/platform
 @dirrm include/allegro/internal
 @dirrm include/allegro/inline
 @dirrm include/allegro
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 639772b5cf4f..1ddff5c955e8 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,139 +1,137 @@
 # New ports collection makefile for:	allegro
 # Date created:		23-Feb-2001
 # Whom:			Jimmy Olgeni <olgeni@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	allegro
 DISTVERSION=	4.2.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	A cross-platform library for games and multimedia programming
 
+USE_AUTOTOOLS=	autoconf:259
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 USE_XLIB=	yes
 WANT_GNOME=	yes
 
-USE_AUTOTOOLS=	autoconf:259
-
-.include "Makefile.man"
-
-INFO=		allegro
-
 OPTIONS=	ARTS "Enable Arts support" off \
-		DEBUG_LIB "Build debugging library" off \
-		DEV_UTILS "Build development utilities" on \
+		DEBUG "Build debugging library" off \
+		DEVEL "Build development utilities" on \
 		ESOUND "Enable Esound support" off \
 		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		PROFILE_LIB "Build profiling library" off \
+		PROFILE "Build profiling library" off \
 		THREADS "Enable threads" on
 
 MAKEFILE=	makefile
 ALL_TARGET=	full-build
 
+.include "Makefile.man"
+
+INFO=		allegro
+
 INSTALLS_SHLIB=	yes
 SHLIB_VER=	42
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 DEMO=		demo.c demo.dat demo.h music.txt ../readme.txt
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-include-allegro-inline-fmaths.in
 .endif
 
-.if defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so.0)
+.if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-CONFIGURE_ARGS+=	--enable-artsdigi
+CONFIGURE_ARGS+=--enable-artsdigi
 PLIST_SUB+=	ARTS=""
 .else
-CONFIGURE_ARGS+=	--disable-artsdigi
+CONFIGURE_ARGS+=--disable-artsdigi
 PLIST_SUB+=	ARTS="@comment "
 .endif
 
-.if defined(WITH_DEBUG_LIB)
-CONFIGURE_ARGS+=	--enable-dbglib
-PLIST_SUB+=	DEBUG_LIB=""
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--enable-dbglib
+PLIST_SUB+=	DEBUG=""
 .else
-CONFIGURE_ARGS+=	--disable-dbglib
-PLIST_SUB+=	DEBUG_LIB="@comment "
+CONFIGURE_ARGS+=--disable-dbglib
+PLIST_SUB+=	DEBUG="@comment "
 .endif
 
-.if !defined(WITHOUT_DEV_UTILS)
+.if !defined(WITHOUT_DEVEL)
 INSTALL_TARGET=	full-install install-man install-info
-PLIST_SUB+=	DEV_UTILS=""
+PLIST_SUB+=	DEVEL=""
 .else
 INSTALL_TARGET=	mini-install install-man install-info
-PLIST_SUB+=	DEV_UTILS="@comment "
+PLIST_SUB+=	DEVEL="@comment "
 .endif
 
-.if defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!=""
+.if defined(WITH_ESOUND)
 USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--enable-esddigi
+CONFIGURE_ARGS+=--enable-esddigi
 PLIST_SUB+=	ESOUND=""
 .else
-CONFIGURE_ARGS+=	--disable-esddigi
+CONFIGURE_ARGS+=--disable-esddigi
 PLIST_SUB+=	ESOUND="@comment "
 .endif
 
-.if defined(WITH_PROFILE_LIB)
-CONFIGURE_ARGS+=	--enable-proflib
-PLIST_SUB+=	PROFILE_LIB=""
+.if defined(WITH_PROFILE)
+CONFIGURE_ARGS+=--enable-proflib
+PLIST_SUB+=	PROFILE=""
 .else
-CONFIGURE_ARGS+=	--disable-proflib
-PLIST_SUB+=	PROFILE_LIB="@comment "
+CONFIGURE_ARGS+=--disable-proflib
+PLIST_SUB+=	PROFILE="@comment "
 .endif
 
 .if !defined(WITHOUT_THREADS)
-CONFIGURE_ARGS+=	--enable-pthreads
+CONFIGURE_ARGS+=--enable-pthreads
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
 		LDFLAGS="${PTHREAD_LIBS}"
 .else
-CONFIGURE_ARGS+=	--disable-pthreads
+CONFIGURE_ARGS+=--disable-pthreads
 .endif
 
 post-patch:
 # Change "x.y.z" into "xy" in the shared library version.
 	@${REINPLACE_CMD} -e 's|${PORTVERSION}|${SHLIB_VER}|g' \
 		${WRKSRC}/makefile.ver
 
 # Remove architecture specific optimizations.
 	@${REINPLACE_CMD} -e 's|$$TARGET_ARCH||g' \
 		${CONFIGURE_WRKSRC}/configure.in
 
 # Remove "-ffast-math" flag on alpha, because it breaks.
 .if ${ARCH} == "alpha"
 	@${REINPLACE_CMD} -e 's|-ffast-math||g' \
 		${CONFIGURE_WRKSRC}/configure.in
 .endif
 
 # Enable/disable compilation optimizations.
 .if defined(WITHOUT_OPTIMIZED_CFLAGS)
 	@${REINPLACE_CMD} -e 's|-O2||g ; \
 		s|-ffast-math||g ; \
 		s|-fomit-frame-pointer||g ; \
 		s|-funroll-loops||g' \
-			${CONFIGURE_WRKSRC}/configure.in
+		${CONFIGURE_WRKSRC}/configure.in
 .endif
 
 post-install:
 # Documentation.
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/*.css  ${DOCSDIR}
 
 # Examples.
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
 .   for f in ${DEMO}
 	${INSTALL_DATA} ${WRKSRC}/demo/${f} ${EXAMPLESDIR}
 .   endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/allegro/pkg-plist b/devel/allegro/pkg-plist
index 03f636bedefc..79155906def8 100644
--- a/devel/allegro/pkg-plist
+++ b/devel/allegro/pkg-plist
@@ -1,196 +1,196 @@
 bin/allegro-config
-%%DEV_UTILS%%bin/colormap
-%%DEV_UTILS%%bin/dat
-%%DEV_UTILS%%bin/dat2c
-%%DEV_UTILS%%bin/dat2s
-%%DEV_UTILS%%bin/exedat
-%%DEV_UTILS%%bin/grabber
-%%DEV_UTILS%%bin/pack
-%%DEV_UTILS%%bin/pat2dat
-%%DEV_UTILS%%bin/rgbmap
-%%DEV_UTILS%%bin/textconv
+%%DEVEL%%bin/colormap
+%%DEVEL%%bin/dat
+%%DEVEL%%bin/dat2c
+%%DEVEL%%bin/dat2s
+%%DEVEL%%bin/exedat
+%%DEVEL%%bin/grabber
+%%DEVEL%%bin/pack
+%%DEVEL%%bin/pat2dat
+%%DEVEL%%bin/rgbmap
+%%DEVEL%%bin/textconv
 include/allegro.h
 include/allegro/3d.h
 include/allegro/3dmaths.h
 include/allegro/alcompat.h
 include/allegro/alinline.h
 include/allegro/alunixac.h
 include/allegro/base.h
 include/allegro/color.h
 include/allegro/compiled.h
 include/allegro/config.h
 include/allegro/datafile.h
 include/allegro/debug.h
 include/allegro/digi.h
 include/allegro/draw.h
 include/allegro/file.h
 include/allegro/fix.h
 include/allegro/fixed.h
 include/allegro/fli.h
 include/allegro/fmaths.h
 include/allegro/font.h
 include/allegro/gfx.h
 include/allegro/graphics.h
 include/allegro/gui.h
 include/allegro/inline/3dmaths.inl
 include/allegro/inline/asm.inl
 include/allegro/inline/color.inl
 include/allegro/inline/draw.inl
 include/allegro/inline/file.inl
 include/allegro/inline/fix.inl
 include/allegro/inline/fmaths.inl
 include/allegro/inline/gfx.inl
 include/allegro/inline/matrix.inl
 include/allegro/inline/rle.inl
 include/allegro/inline/system.inl
 include/allegro/internal/aintern.h
 include/allegro/internal/aintvga.h
 include/allegro/internal/alconfig.h
 include/allegro/joystick.h
 include/allegro/keyboard.h
 include/allegro/lzss.h
 include/allegro/matrix.h
 include/allegro/midi.h
 include/allegro/mouse.h
 include/allegro/palette.h
 include/allegro/platform/aintbeos.h
 include/allegro/platform/aintdos.h
 include/allegro/platform/aintlnx.h
 include/allegro/platform/aintmac.h
 include/allegro/platform/aintosx.h
 include/allegro/platform/aintqnx.h
 include/allegro/platform/aintunix.h
 include/allegro/platform/aintwin.h
 include/allegro/platform/al386gcc.h
 include/allegro/platform/al386vc.h
 include/allegro/platform/al386wat.h
 include/allegro/platform/albcc32.h
 include/allegro/platform/albecfg.h
 include/allegro/platform/albeos.h
 include/allegro/platform/aldjgpp.h
 include/allegro/platform/aldos.h
 include/allegro/platform/almac.h
 include/allegro/platform/almaccfg.h
 include/allegro/platform/almngw32.h
 include/allegro/platform/almsvc.h
 include/allegro/platform/alosx.h
 include/allegro/platform/alosxcfg.h
 include/allegro/platform/alplatf.h
 include/allegro/platform/alqnx.h
 include/allegro/platform/alqnxcfg.h
 include/allegro/platform/alucfg.h
 include/allegro/platform/alunix.h
 include/allegro/platform/alunixac.h
 include/allegro/platform/alwatcom.h
 include/allegro/platform/alwin.h
 include/allegro/platform/astdint.h
 include/allegro/platform/macdef.h
 include/allegro/quat.h
 include/allegro/rle.h
 include/allegro/sound.h
 include/allegro/stream.h
 include/allegro/system.h
 include/allegro/text.h
 include/allegro/timer.h
 include/allegro/unicode.h
 include/linalleg.h
 include/xalleg.h
 %%ARTS%%lib/allegro/%%SHLIB_VER%%/alleg-artsdigi.so
 lib/allegro/%%SHLIB_VER%%/alleg-dga2.so
 %%ESOUND%%lib/allegro/%%SHLIB_VER%%/alleg-esddigi.so
 lib/allegro/%%SHLIB_VER%%/modules.lst
-%%DEBUG_LIB%%lib/liballd.so
-%%DEBUG_LIB%%lib/liballd.so.%%SHLIB_VER%%
-%%DEBUG_LIB%%lib/liballd_unsharable.a
+%%DEBUG%%lib/liballd.so
+%%DEBUG%%lib/liballd.so.%%SHLIB_VER%%
+%%DEBUG%%lib/liballd_unsharable.a
 lib/liballeg.so
 lib/liballeg.so.%%SHLIB_VER%%
 lib/liballeg_unsharable.a
-%%PROFILE_LIB%%lib/liballp.so
-%%PROFILE_LIB%%lib/liballp.so.%%SHLIB_VER%%
-%%PROFILE_LIB%%lib/liballp_unsharable.a
+%%PROFILE%%lib/liballp.so
+%%PROFILE%%lib/liballp.so.%%SHLIB_VER%%
+%%PROFILE%%lib/liballp_unsharable.a
 share/aclocal/allegro.m4
 %%PORTDOCS%%%%DOCSDIR%%/abi.html
 %%PORTDOCS%%%%DOCSDIR%%/ahack.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg000.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg001.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg002.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg003.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg004.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg005.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg006.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg007.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg008.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg009.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg010.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg011.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg012.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg013.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg014.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg015.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg016.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg017.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg018.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg019.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg020.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg021.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg022.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg023.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg024.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg025.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg026.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg027.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg028.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg029.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg030.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg031.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg032.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg033.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg034.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg035.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg036.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg037.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg038.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg039.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg040.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg041.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg042.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg043.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg044.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg045.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg046.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg047.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg048.html
 %%PORTDOCS%%%%DOCSDIR%%/alleg049.html
 %%PORTDOCS%%%%DOCSDIR%%/allegro.css
 %%PORTDOCS%%%%DOCSDIR%%/allegro.html
 %%PORTDOCS%%%%DOCSDIR%%/api.html
 %%PORTDOCS%%%%DOCSDIR%%/changes.html
 %%PORTDOCS%%%%DOCSDIR%%/const.html
 %%PORTDOCS%%%%DOCSDIR%%/dat.html
 %%PORTDOCS%%%%DOCSDIR%%/dat2c.html
 %%PORTDOCS%%%%DOCSDIR%%/dat2s.html
 %%PORTDOCS%%%%DOCSDIR%%/datafile.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/grabber.html
 %%PORTDOCS%%%%DOCSDIR%%/help.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/license.html
 %%PORTDOCS%%%%DOCSDIR%%/makedoc.html
 %%PORTDOCS%%%%DOCSDIR%%/mistakes.html
 %%PORTDOCS%%%%DOCSDIR%%/packfile.html
 %%PORTDOCS%%%%DOCSDIR%%/readme.html
 %%PORTDOCS%%%%DOCSDIR%%/thanks.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/music.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/readme.txt
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/allegro/%%SHLIB_VER%%
 @dirrm lib/allegro
 @dirrm include/allegro/platform
 @dirrm include/allegro/internal
 @dirrm include/allegro/inline
 @dirrm include/allegro