- Format tabs, sort variables and put targets at the end.

- Remove USE_REINPLACE.
- Fix OPTIONS handling.
- Bump PORTREVISION.

Approved by:	garga (mentor)

1 files changed, 28 insertions, 28 deletions

diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index d8ccb57..67f0e5e 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	generator
 PORTVERSION=	0.35
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.squish.net/generator/files/
 
@@ -16,15 +16,16 @@ COMMENT=	SEGA Genesis emulator
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
-PLIST_FILES=	bin/${PORTNAME}-gtk
 USE_GNOME=	gtk12
 USE_SDL=	sdl
 USE_GMAKE=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=	--with-gtk
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=--with-gtk
+
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
@@ -32,48 +33,47 @@ OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
 		RAZE "Use RAZE z80 emulation (only for i386)" on \
 		SDL_AUDIO "Use SDL for audio" off
 
-post-install:
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
+PLIST_FILES=	bin/${PORTNAME}-gtk
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "amd64" && ${ARCH} != "i386"
-USE_REINPLACE=	yes
-
 post-patch:
 # These architectures do not support "-minline-all-stringops"
 	@${REINPLACE_CMD} -e 's|-minline-all-stringops||g' \
-				${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.if ${ARCH} == "alpha"
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.   if ${ARCH} == "alpha"
 # "-ffast-math" does not work on alpha
 	@${REINPLACE_CMD} -e 's|-ffast-math||g' \
-				${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.   endif
 .endif
 
 # Generator does not automatically determine the GCC version.
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-.	if ${OSVERSION} < 500035
-CONFIGURE_ARGS+=	--with-gcc=2
-.	elif ${OSVERSION} >= 500035
-CONFIGURE_ARGS+=	--with-gcc=3
-.	endif
+.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.   if ${OSVERSION} < 500035
+CONFIGURE_ARGS+=--with-gcc=2
+.   elif ${OSVERSION} >= 500035
+CONFIGURE_ARGS+=--with-gcc=3
+.   endif
 .else
-CONFIGURE_ARGS+=	--without-gcc
+CONFIGURE_ARGS+=--without-gcc
 .endif
 
-.if defined(WITH_RAZE) && ${ARCH} == "i386"
-BUILD_DEPENDS+=		nasm:${PORTSDIR}/devel/nasm
-CONFIGURE_ARGS+=	--with-raze
+.if !defined(WITHOUT_RAZE) && ${ARCH} == "i386"
+BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+CONFIGURE_ARGS+=--with-raze
 .else
-CONFIGURE_ARGS+=	--with-cmz80
+CONFIGURE_ARGS+=--with-cmz80
 .endif
 
 .if defined(WITH_SDL_AUDIO)
-CONFIGURE_ARGS+=	--with-sdl-audio
+CONFIGURE_ARGS+=--with-sdl-audio
 .endif
 
+post-install:
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
+
 .include <bsd.port.post.mk>