===================================================================
RCS file: /cvs/ports/games/ufoai/base/Attic/Makefile,v
retrieving revision 1.5
retrieving revision 1.10
diff -u -r1.5 -r1.10
--- ports/games/ufoai/base/Attic/Makefile	2011/05/02 14:15:30	1.5
+++ ports/games/ufoai/base/Attic/Makefile	2011/05/16 14:41:56	1.10
@@ -1,5 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2011/05/02 14:15:30 yason Exp $
+# $OpenBSD: Makefile,v 1.10 2011/05/16 14:41:56 yason Exp $
 
+SHARED_ONLY = 		Yes
+
 COMMENT-main =		squad-based tactical strategy game
 COMMENT-editor = 	UFO:AI map editor
 
@@ -12,23 +14,29 @@
 
 MULTI_PACKAGES = 	-main -editor
 
-WANTLIB += GL SDL SDL_image c jpeg m ogg png pthread tiff vorbis vorbisfile z
+WANTLIB += GL SDL SDL_image c jpeg m ogg png pthread tiff 
+WANTLIB += vorbis vorbisfile z
 
-WANTLIB-main += FLAC SDL_mixer SDL_ttf crypto curl curses iconv idn intl
-WANTLIB-main += mikmod smpeg ssl theora xvidcore ${WANTLIB}
+WANTLIB-main += FLAC SDL_mixer SDL_ttf crypto curl curses 
+WANTLIB-main += iconv idn intl mikmod smpeg ssl theora
+WANTLIB-main += xvidcore ${WANTLIB}
 
-WANTLIB-editor += GLU ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
-WANTLIB-editor += Xext Xfixes Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm
-WANTLIB-editor += atk-1.0 cairo drm expat fontconfig freetype gdk-x11-2.0
-WANTLIB-editor += gdk_pixbuf-2.0 gdkglext-x11-1.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB-editor += gobject-2.0 gthread-2.0 gtk-x11-2.0 gtkglext-x11-1.0
-WANTLIB-editor += gtksourceview-2.0 openal pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB-editor += GLU ICE SM X11 Xau Xcomposite Xcursor Xdamage
+WANTLIB-editor += Xdmcp Xext Xfixes Xi Xinerama Xmu Xrandr Xrender
+WANTLIB-editor += Xt Xxf86vm atk-1.0 cairo drm expat fontconfig
+WANTLIB-editor += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0
+WANTLIB-editor += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB-editor += gtk-x11-2.0 gtkglext-x11-1.0 gtksourceview-2.0
+WANTLIB-editor += openal pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB-editor += pangox-1.0 pixman-1 pthread-stubs sndio stdc++ xcb
 WANTLIB-editor += xcb-render xcb-shm xml2 ${WANTLIB}
 
 MODULES = 		devel/gettext
 
-RUN_DEPENDS = 		games/ufoai/data \
+BUILD_DEPENDS = 	${MODGNU_AUTOCONF_DEPENDS} \
+			${MODGNU_AUTOMAKE_DEPENDS}
+
+RUN_DEPENDS = 		games/ufoai/data>=${V} \
 			devel/desktop-file-utils
 
 LIB_DEPENDS-main =	devel/sdl-image \
@@ -49,31 +57,34 @@
 			x11/gtksourceview
 
 USE_GMAKE =		Yes
-MAKE_FLAGS += 		CFLAGS='-DHAVE_CONFIG_H -Wall -pipe -ansi' \
-			${CONFIGURE_ENV}
+MAKE_FLAGS += 		${CONFIGURE_ENV}
+
+CFLAGS += 		-pthread
+
 AUTOCONF_VERSION = 	2.67
 AUTOMAKE_VERSION = 	1.9
-CONFIGURE_STYLE =	autoconf automake
+CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS =	--enable-release=yes \
 			--enable-ufo2map \
 			--enable-uforadiant \
 			--disable-tests
 
-CONFIGURE_ENV +=	CFLAGS="-pthread" \
-			CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV +=	CFLAGS="${CFLAGS}" \
+			CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+				-I${LOCALBASE}/include/libpng" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv"
 
+NO_REGRESS = 		Yes
+
 ALL_TARGET = 		all uforadiant
 INSTALL_TARGET = 	install_exec
 
 post-extract:
-	${INSTALL_DATA_DIR} ${WRKSRC}/base
+	mkdir -p ${WRKSRC}/base/{maps,models}
 
-post-patch:
+pre-configure:
 	perl -pi -e 's,/usr/share/games/,${PREFIX}/share/,g' ${WRKSRC}/debian/*.6
 	perl -pi -e 's,/usr/games/,${PREFIX}/bin/,g' ${WRKSRC}/debian/*.desktop
-
-pre-configure:
 	cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
 		AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal
 	cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
@@ -81,6 +92,7 @@
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/ufoai
+	${INSTALL_DATA} ${WRKSRC}/LICENSES ${PREFIX}/share/ufoai
 	${INSTALL_MAN} ${WRKSRC}/debian/*.6 ${PREFIX}/man/man6
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/debian/*.desktop ${PREFIX}/share/applications
@@ -89,6 +101,7 @@
 		"${PREFIX}/share/ufoai/radiant/{}" \;
 	cd ${WRKSRC}/radiant && find * -type f -mindepth 1 -exec ${INSTALL_DATA} \
 		"{}" "${PREFIX}/share/ufoai/radiant/{}" \;
-	${INSTALL_PROGRAM} ${WRKSRC}/radiant/uforadiant ${PREFIX}/share/ufoai/radiant/
+	${INSTALL_PROGRAM} ${WRKSRC}/radiant/uforadiant \
+		${PREFIX}/share/ufoai/radiant/
 
 .include <bsd.port.mk>