From owner-svn-ports-head@FreeBSD.ORG Thu Feb 27 09:24:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 965E734D; Thu, 27 Feb 2014 09:24:16 +0000 (UTC) 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 76CC110CE; Thu, 27 Feb 2014 09:24:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1R9OGFM055123; Thu, 27 Feb 2014 09:24:16 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1R9OF73055118; Thu, 27 Feb 2014 09:24:15 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201402270924.s1R9OF73055118@svn.freebsd.org> From: Martin Wilke Date: Thu, 27 Feb 2014 09:24:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346300 - in head/games/viruskiller: . 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2014 09:24:16 -0000 Author: miwi Date: Thu Feb 27 09:24:15 2014 New Revision: 346300 URL: http://svnweb.freebsd.org/changeset/ports/346300 QAT: https://qat.redports.org/buildarchive/r346300/ Log: - Fix build - Fix pathname in desktop entry file PR: 187055 Added: head/games/viruskiller/files/ head/games/viruskiller/files/patch-src__pak.cpp (contents, props changed) Modified: head/games/viruskiller/Makefile head/games/viruskiller/pkg-descr head/games/viruskiller/pkg-plist Modified: head/games/viruskiller/Makefile ============================================================================== --- head/games/viruskiller/Makefile Thu Feb 27 09:22:59 2014 (r346299) +++ head/games/viruskiller/Makefile Thu Feb 27 09:24:15 2014 (r346300) @@ -3,7 +3,7 @@ PORTNAME= viruskiller PORTVERSION= 1.03 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= FRUGALWARE/games-extra/${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION}-1 @@ -13,40 +13,29 @@ COMMENT= Arcade game that relies on quic LICENSE= GPLv2 -OPTIONS_DEFINE= DOCS - -USE_SDL= mixer image ttf net -USES= gmake - -BROKEN= Does not build -DEPRECATED= Broken for more then 6 month -EXPIRATION_DATE= 2014-02-27 - -INSTALLS_ICONS= yes - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USES= gmake +USE_SDL= mixer image ttf net MAKEFILE= makefile +INSTALLS_ICONS= yes -NO_STAGE= yes -.include - -.if ${ARCH} == "amd64" -BROKEN= Does not build with new libz -.endif +OPTIONS_DEFINE= DOCS post-patch: - # Remove non-free restricted files: - ${RM} -f ${WRKSRC}/music/* ${WRKSRC}/sound/* - -.if ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e "s|^.*install.*DOCS.*||g" \ - -e "s|^.*mkdir.*DOCDIR.*||g" \ - ${WRKSRC}/makefile -.endif - @${REINPLACE_CMD} -e "s|^PREFIX.*|PREFIX=${PREFIX}|g" \ - -e "s|^BINDIR.*|BINDIR=${PREFIX}/bin/|g" \ - -e "s|^DATADIR.*|DATADIR=${DATADIR}/|g" \ - -e "s|^DOCDIR.*|DOCDIR=${DOCSDIR}|g" ${WRKSRC}/makefile + @${REINPLACE_CMD} -e \ + '/^DOCS/s|=.*|= doc/README doc/*.*| ; \ + /^PREFIX/s|=.*|= ${PREFIX}| ; \ + /^BINDIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/bin/| ; \ + /^DATADIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/${DATADIR_REL}/| ; \ + /^DOCDIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/${DOCSDIR_REL}/| ; \ + /^ICONDIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/share/icons/hicolor/| ; \ + /^DESKTOPDIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/share/applications/| ; \ + s|install .* 755|$${BSD_INSTALL_PROGRAM}| ; \ + s|install .* 644|$${BSD_INSTALL_DATA}| ; \ + /ICONS/s|cp|$${BSD_INSTALL_DATA}|' ${WRKSRC}/makefile + @${REINPLACE_CMD} -e \ + 's|.png|| ; \ + s|/usr/games/||' ${WRKSRC}/icons/viruskiller.desktop .include Added: head/games/viruskiller/files/patch-src__pak.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/viruskiller/files/patch-src__pak.cpp Thu Feb 27 09:24:15 2014 (r346300) @@ -0,0 +1,27 @@ +--- src/pak.cpp.orig ++++ src/pak.cpp +@@ -124,7 +124,7 @@ + { + printf("Couldn't open %s for reading!\n", filename); + closedir(dirp); +- gzclose(pak); ++ gzclose((gzFile)pak); + exit(1); + } + +@@ -156,13 +156,13 @@ + { + printf("Couldn't open %s for reading!\n", filename); + closedir(dirp); +- gzclose(pak); ++ gzclose((gzFile)pak); + exit(1); + } + else + { + fSize = gzread(fp, buffer, filesize); +- gzclose(fp); ++ gzclose((gzFile)fp); + + cSize = (uLongf)((fSize * 1.01) + 12); + compress2(output, &cSize, buffer, fSize, 9); Modified: head/games/viruskiller/pkg-descr ============================================================================== --- head/games/viruskiller/pkg-descr Thu Feb 27 09:22:59 2014 (r346299) +++ head/games/viruskiller/pkg-descr Thu Feb 27 09:24:15 2014 (r346300) @@ -1,9 +1,9 @@ -Your computer has been invaded! Dozens of little viruses are pouring in via -security holes in Microsoft Internet Explorer, Microsoft Outlook, Microsoft MSN -Messenger and Microsoft Recycle Bin!! Using your trusty mouse you must shoot the -buggers before they can destroy your files! Some will steal them from their home -directories and take them back to their security hole. Others will just eat them -right there on the spot! See how long you and your computer can survive the -onslaught! +Your computer has been invaded! Dozens of little viruses are pouring in +via security holes in Microsoft Internet Explorer, Microsoft Outlook, +Microsoft MSN Messenger and Microsoft Recycle Bin!! Using your trusty +mouse you must shoot the buggers before they can destroy your files! +Some will steal them from their home directories and take them back to +their security hole. Others will just eat them right there on the spot! +See how long you and your computer can survive the onslaught! WWW: http://www.parallelrealities.co.uk/projects/virusKiller.php Modified: head/games/viruskiller/pkg-plist ============================================================================== --- head/games/viruskiller/pkg-plist Thu Feb 27 09:22:59 2014 (r346299) +++ head/games/viruskiller/pkg-plist Thu Feb 27 09:24:15 2014 (r346300) @@ -1,6 +1,5 @@ bin/viruskiller -%%DATADIR%%/viruskiller.pak -%%PORTDOCS%%%%DOCSDIR%%/LICENSE +share/applications/viruskiller.desktop %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/battery.png %%PORTDOCS%%%%DOCSDIR%%/bomb.png @@ -13,14 +12,6 @@ bin/viruskiller share/icons/hicolor/16x16/apps/viruskiller.png share/icons/hicolor/32x32/apps/viruskiller.png share/icons/hicolor/64x64/apps/viruskiller.png -share/applications/viruskiller.desktop +%%DATADIR%%/viruskiller.pak +@dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry %%DATADIR%% -@dirrmtry share/icons/hicolor/64x64/apps -@dirrmtry share/icons/hicolor/64x64 -@dirrmtry share/icons/hicolor/32x32/apps -@dirrmtry share/icons/hicolor/32x32 -@dirrmtry share/icons/hicolor/16x16/apps -@dirrmtry share/icons/hicolor/16x16 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons