From owner-svn-ports-all@FreeBSD.ORG Wed Jul 31 05:36:34 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 938FC738; Wed, 31 Jul 2013 05:36:34 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7BFDF2A91; Wed, 31 Jul 2013 05:36:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6V5aYf9023293; Wed, 31 Jul 2013 05:36:34 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6V5aXvC023290; Wed, 31 Jul 2013 05:36:33 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201307310536.r6V5aXvC023290@svn.freebsd.org> From: Alexey Dokuchaev Date: Wed, 31 Jul 2013 05:36:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324003 - in head/games/xgalaga: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Jul 2013 05:36:34 -0000 Author: danfe Date: Wed Jul 31 05:36:33 2013 New Revision: 324003 URL: http://svnweb.freebsd.org/changeset/ports/324003 Log: - Fix parallel (-jX) builds, remove jobs unsafe mark - Fix MASTER_SITES, define LICENSE (GPLv2) - Improve COMMENT and port description, add WWW link - Utilize newly added option helpers, sort the knobs Modified: head/games/xgalaga/Makefile head/games/xgalaga/files/patch-aa head/games/xgalaga/pkg-descr Modified: head/games/xgalaga/Makefile ============================================================================== --- head/games/xgalaga/Makefile Wed Jul 31 05:25:47 2013 (r324002) +++ head/games/xgalaga/Makefile Wed Jul 31 05:36:33 2013 (r324003) @@ -1,36 +1,33 @@ -# Created by: asami +# Created by: Satoshi Asami # $FreeBSD$ PORTNAME= xgalaga PORTVERSION= 2.1.1.0 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ +MASTER_SITES= SF/${PORTNAME} MAINTAINER= turutani@scphys.kyoto-u.ac.jp -COMMENT= Galaga resurrected on X +COMMENT= Clone of the classic game Galaga for X11 + +LICENSE= GPLv2 USES= gmake -MAKE_JOBS_UNSAFE= yes USE_XORG= xpm xmu HAS_CONFIGURE= yes -MAN6= xgalaga.6x -MANCOMPRESSED= yes + # xgalaga has a very strange usage of these variables... CONFIGURE_ARGS= --prefix=${LOCALBASE}/lib/X11/xgalaga \ --mandir=${LOCALBASE}/man \ --exec_prefix=${LOCALBASE}/bin +MAN6= xgalaga.6x +MANCOMPRESSED= yes + OPTIONS_DEFINE= SOUND OPTIONS_DEFAULT= SOUND +OPTIONS_SUB= yes -.include - -.if empty(PORT_OPTIONS:MSOUND) -CONFIGURE_ARGS+= --without-sound -PLIST_SUB= SOUND="@comment " -.else -PLIST_SUB= SOUND="" -.endif +SOUND_CONFIGURE_OFF= --without-sound post-install: @${STRIP_CMD} ${PREFIX}/bin/xgalaga Modified: head/games/xgalaga/files/patch-aa ============================================================================== --- head/games/xgalaga/files/patch-aa Wed Jul 31 05:25:47 2013 (r324002) +++ head/games/xgalaga/files/patch-aa Wed Jul 31 05:36:33 2013 (r324003) @@ -13,3 +13,44 @@ distversion = 2.1.1.0 @SET_MAKE@ +@@ -74,14 +74,14 @@ + # chmod ${GAMEMODE} $(bindir)/$(TARGET) + # chmod ${GAMEDATAMODE} $(prefix)/scores + +-subdirs: +- for i in $(SUBDIRS); do cd $$i ; make ; done ++$(SUBDIRS):: ++ $(MAKE) -C $@ + +-$(TARGET): subdirs $(OBJS) ++$(TARGET): $(SUBDIRS) $(OBJS) + $(RM) $(TARGET) + $(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) + +-$(TARGET2): subdirs $(OBJS_HYPER) ++$(TARGET2): $(SUBDIRS) $(OBJS_HYPER) + $(RM) $(TARGET2) + $(CC) $(LDFLAGS) -o $(TARGET2) $(OBJS_HYPER) $(LIBS) + +@@ -98,17 +98,17 @@ + $(RM) core *.o $(OBJS) $(OBJS_HYPER) $(TARGET) $(TARGET2) $(MANPAGE) + + dist: clean +- cd libsprite;make clean ++ $(MAKE) -C libsprite clean + if test -d xgalaga-$(distverson) ; then echo -n; else mkdir xgalaga-$(distversion); fi + cp -rf $(SRCS) configure *.in *.sub *.guess images sounds xgal.sndsrv.*.c libsprite README* INSTALL CHANGES CREDITS xgalaga.6x *.h install-sh levels mkimgsrc* mkinstalldirs xgalaga-$(distversion) +- cd xgalaga-$(distversion); rm -f config.h +- cd xgalaga-$(distversion)/libsprite; make distclean ; rm -rf CVS ++ rm -f xgalaga-$(distversion)/config.h ++ $(MAKE) -C xgalaga-$(distversion)/libsprite distclean + find xgalaga-$(distversion) -name "CVS" -exec rm -rf {} \; -prune + tar czvf xgalaga-$(distversion).tar.gz xgalaga-$(distversion) + + distclean: clean + $(RM) Makefile config.h config.status config.cache config.log +- cd libsprite;$(MAKE) distclean ++ $(MAKE) -C libsprite distclean + + depend: + makedepend $(CFLAGS) $(SRCS) Modified: head/games/xgalaga/pkg-descr ============================================================================== --- head/games/xgalaga/pkg-descr Wed Jul 31 05:25:47 2013 (r324002) +++ head/games/xgalaga/pkg-descr Wed Jul 31 05:36:33 2013 (r324003) @@ -1,5 +1,4 @@ -xgalaga is a rework of the Galaga shooting game. +XGalaga is a clone of the classic game Galaga for X11, a space-invader like +game with additional features to produce a more interesting game. -The package is built to use the sound device in /dev/dsp. If you don't -have a sound card and are getting core dumps, try recompiling it with -"make -DNOSOUND". +WWW: http://rumsey.org/xgal.html