Use CFLAGS_${ARCH}

3 files changed, 8 insertions, 17 deletions

diff --git a/audio/xmms-a52dec/Makefile b/audio/xmms-a52dec/Makefile
index 4c0ff3494f45..d4c775cc5c2f 100644
--- a/audio/xmms-a52dec/Makefile
+++ b/audio/xmms-a52dec/Makefile
@@ -18,10 +18,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk12
 CFLAGS+=	`xmms-config --cflags` -L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
-.if ${ARCH} == "amd64"
-CFLAGS+=	-fPIC
-.endif
+CFLAGS_amd64=	fPIC
 
 PLIST_FILES=	lib/xmms/Input/liba52dec.so
 
@@ -33,4 +30,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/liba52dec.so \
 		${STAGEDIR}${PREFIX}/lib/xmms/Input/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/xmms-fc/Makefile b/audio/xmms-fc/Makefile
index 3abe72aff674..c97f87c57ed7 100644
--- a/audio/xmms-fc/Makefile
+++ b/audio/xmms-fc/Makefile
@@ -35,11 +35,8 @@ LIBFC_PORTNAME=	libfc14audiodecoder
 LIBFC_PORTVERSION=	1.0.2
 LIBFC_DISTNAME=	${LIBFC_PORTNAME}-${LIBFC_PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CXXFLAGS+=	-fPIC -DPIC
-.endif
+CFLAGS_amd64=	-fPIC -DPIC
+CFLAGS_ia64=	-fPIC -DPIC
 
 pre-configure:
 	@(cd ${WRKDIR}/${LIBFC_DISTNAME} && ./configure --disable-shared \
@@ -49,4 +46,4 @@ pre-build:
 	@(cd ${WRKDIR}/${LIBFC_DISTNAME} && ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET} ${MAKE_ARGS})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/xmms-mp3cue/Makefile b/audio/xmms-mp3cue/Makefile
index 804d7bfa9979..51c7485af6f8 100644
--- a/audio/xmms-mp3cue/Makefile
+++ b/audio/xmms-mp3cue/Makefile
@@ -19,13 +19,10 @@ NO_STAGE=	yes
 
 PLIST_SUB=	PORTDOCS=${DISTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+=	-fPIC
-.endif
+CFLAGS_amd64=	-fPIC
+CFLAGS_ia64=	-fPIC
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/*.c
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>