From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Feb 25 18:10:06 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 ESMTPS id 416F1B85 for ; Tue, 25 Feb 2014 18:10:06 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 1FF13166A for ; Tue, 25 Feb 2014 18:10:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s1PIA54d042441 for ; Tue, 25 Feb 2014 18:10:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s1PIA5fF042440; Tue, 25 Feb 2014 18:10:05 GMT (envelope-from gnats) Resent-Date: Tue, 25 Feb 2014 18:10:05 GMT Resent-Message-Id: <201402251810.s1PIA5fF042440@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru 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 ESMTPS id 11175718 for ; Tue, 25 Feb 2014 18:01:00 +0000 (UTC) Received: from omta01.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17]) by mx1.freebsd.org (Postfix) with ESMTP id C85F31575 for ; Tue, 25 Feb 2014 18:00:59 +0000 (UTC) Received: from coppermine.my.domain (ZT028143.ppp.dion.ne.jp [59.128.28.143]) by omta01.auone-net.jp (au one net mail) with ESMTP id 5E133980008 for ; Wed, 26 Feb 2014 03:00:56 +0900 (JST) Message-Id: <20140226025230.79187ee7cada9dcb55647594@yahoo.com> Date: Wed, 26 Feb 2014 02:52:30 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/187055: games/viruskiller: Fix build X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 18:10:06 -0000 X-List-Received-Date: Tue, 25 Feb 2014 18:10:06 -0000 >Number: 187055 >Category: ports >Synopsis: games/viruskiller: Fix build >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 25 18:10:05 UTC 2014 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p7 i386 >Organization: >Environment: >Description: - Fix build - Fix pathname in desktop entry file New file: files/patch-src__pak.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/games/viruskiller/Makefile games/viruskiller/Makefile --- /usr/ports/games/viruskiller/Makefile 2014-01-28 22:12:04.000000000 +0900 +++ games/viruskiller/Makefile 2014-02-26 00:00:00.000000000 +0900 @@ -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 @@ 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 diff -urN /usr/ports/games/viruskiller/files/patch-src__pak.cpp games/viruskiller/files/patch-src__pak.cpp --- /usr/ports/games/viruskiller/files/patch-src__pak.cpp 1970-01-01 09:00:00.000000000 +0900 +++ games/viruskiller/files/patch-src__pak.cpp 2014-02-26 00:00:00.000000000 +0900 @@ -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); diff -urN /usr/ports/games/viruskiller/pkg-descr games/viruskiller/pkg-descr --- /usr/ports/games/viruskiller/pkg-descr 2014-01-23 05:22:40.000000000 +0900 +++ games/viruskiller/pkg-descr 2014-02-26 00:00:00.000000000 +0900 @@ -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 diff -urN /usr/ports/games/viruskiller/pkg-plist games/viruskiller/pkg-plist --- /usr/ports/games/viruskiller/pkg-plist 2014-01-23 05:22:40.000000000 +0900 +++ games/viruskiller/pkg-plist 2014-02-26 00:00:00.000000000 +0900 @@ -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 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: