From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 5 06:31:17 2009 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65D761065670 for ; Thu, 5 Nov 2009 06:31:17 +0000 (UTC) (envelope-from c.petrik.sosa@gmail.com) Received: from mail-pz0-f202.google.com (mail-pz0-f202.google.com [209.85.222.202]) by mx1.freebsd.org (Postfix) with ESMTP id 34CBB8FC0A for ; Thu, 5 Nov 2009 06:31:16 +0000 (UTC) Received: by pzk40 with SMTP id 40so5226062pzk.7 for ; Wed, 04 Nov 2009 22:31:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :content-type; bh=bqFl7nsrg0D8ygE1XoWgASFmqYRBrs+plnmNq0jR86I=; b=NNN+pjt/shwoWDuq5fmLQ8xNGqn7l83mzr36k30p2iJIFXXjbFLqdq76wbF0D80CA9 K1mbMYPUBVrfvYR3uMXiJm1d9IGOR2RYpfOkXAwhTIB1eWqEaR0q1fyKqKmWyGPUo9YD ypZRPu17Sn2ayKayZ8Mh0GCDLsDbecdwcA46M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; b=MDIp/g9/MAYWIdmTANVW+nF2SV0N89kSUqwf2hXDBnhIo4v58kPbdSYpmIHxe/Xiy2 zwVDTK0bCYHHoosHAjpAiKs249yyRWG1OHhyAujdk2BFWOz+43t+FSTTbHybpWQOFa+O 0Zxy5QaPMxDuvV5BRHs+hwJPI9nys0wgD6RW4= Received: by 10.114.9.2 with SMTP id 2mr4149771wai.197.1257401018602; Wed, 04 Nov 2009 22:03:38 -0800 (PST) Received: from ?10.10.10.98? ([189.148.138.191]) by mx.google.com with ESMTPS id 22sm29463pxi.14.2009.11.04.22.03.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 04 Nov 2009 22:03:37 -0800 (PST) Message-ID: <4AF26AB3.5070404@officialunix.com> Date: Thu, 05 Nov 2009 00:03:31 -0600 From: Chris Petrik User-Agent: Thunderbird 2.0.0.23 (X11/20091008) MIME-Version: 1.0 To: freebsd-ports-bugs@FreeBSD.org References: <200911050240.nA52e2S8008311@freefall.freebsd.org> In-Reply-To: <200911050240.nA52e2S8008311@freefall.freebsd.org> Content-Type: multipart/mixed; boundary="------------010809050609020204050706" Cc: Subject: Re: ports/140283: [PATCH] update games/abuse_sdl to 0.7.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2009 06:31:17 -0000 This is a multi-part message in MIME format. --------------010809050609020204050706 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Please use this patch instead, this patches fixes the following: conflict between bin/abuse in games/abuse and the new games/abuse_sdl removal of pkg_plist since it's only 4 files, easier way I could think of to copy abuse to abuse.sdl, without hackering the Makefile.* files. Did not realize games/abuse installs a binary :) Added PLIST_* for files and dirs. --------------010809050609020204050706 Content-Type: text/plain; name="patch-abuse-new.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-abuse-new.diff" Index: abuse_sdl/Makefile =================================================================== RCS file: /usr/ncvs/ports/games/abuse_sdl/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- abuse_sdl/Makefile 19 Sep 2009 11:39:34 -0000 1.20 +++ abuse_sdl/Makefile 5 Nov 2009 05:54:07 -0000 @@ -6,14 +6,13 @@ # PORTNAME= abuse_sdl -PORTVERSION= 0.7.0 -PORTREVISION= 5 +PORTVERSION= 0.7.1 CATEGORIES= games -MASTER_SITES= http://abuse.zoy.org/raw-attachment/wiki/Downloads/ \ +MASTER_SITES= http://abuse.zoy.org/raw/Downloads/ \ http://epix.linux.tucows.com/files/ \ http://blueyonder.linux.tucows.com/files/ \ http://casemanl.linux.tucows.com/files/ -DISTNAME= abuse-sdl-${PORTVERSION} +DISTNAME= abuse-${PORTVERSION} MAINTAINER= chris@officialunix.com COMMENT= An SDL port of the Abuse game engine @@ -24,10 +23,30 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +WRKSRC= ${WRKDIR}/${DISTNAME} -MAN6= abuse-sdl.6 +MAN6= abuse.6 + +PLIST_FILES= bin/abuse.sdl \ + share/abuse_sdl/abuse.bmp \ + share/abuse_sdl/abuse.lsp \ + share/abuse_sdl/abuse.png + +PLIST_DIRS= share/abuse_sdl post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure +do-install: + ${ECHO_CMD} "Installing data files." + ${MKDIR} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/abuse.bmp ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/abuse.lsp ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/abuse.png ${DATADIR} + ${INSTALL_MAN} ${WRKSRC}/abuse.6 ${MANPREFIX}/man/man6 + ${ECHO_CMD} "Done." + ${ECHO_CMD} "Installing abuse binary as abuse.sdl" + ${INSTALL_PROGRAM} ${WRKSRC}/src/abuse ${LOCALBASE}/bin/abuse.sdl + ${ECHO_CMD} "Done." + .include Index: abuse_sdl/distinfo =================================================================== RCS file: /usr/ncvs/ports/games/abuse_sdl/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- abuse_sdl/distinfo 31 Jan 2009 21:16:37 -0000 1.5 +++ abuse_sdl/distinfo 5 Nov 2009 02:24:23 -0000 @@ -1,3 +1,3 @@ -MD5 (abuse-sdl-0.7.0.tar.gz) = 417f07dd34d92564f6a10260e4a41baa -SHA256 (abuse-sdl-0.7.0.tar.gz) = 2efadf8a9f85ae4509a410d600172625c674f49c4e8eb56eed7bd697ea03e3bc -SIZE (abuse-sdl-0.7.0.tar.gz) = 676076 +MD5 (abuse-0.7.1.tar.gz) = 439b607f291560a8f9698a2f09cffa63 +SHA256 (abuse-0.7.1.tar.gz) = 1516a19efc1b89715a8549109a0d87b71502d94fd8b782942e335b6782a1dd57 +SIZE (abuse-0.7.1.tar.gz) = 719285 Index: abuse_sdl/pkg-plist =================================================================== RCS file: abuse_sdl/pkg-plist diff -N abuse_sdl/pkg-plist --- abuse_sdl/pkg-plist 14 Sep 2002 22:10:47 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,5 +0,0 @@ -bin/abuse.sdl -share/abuse_sdl/abuse.bmp -share/abuse_sdl/abuse.lsp -share/abuse_sdl/abuse.png -@dirrm share/abuse_sdl Index: abuse_sdl/files/patch-Makefile.in =================================================================== RCS file: /usr/ncvs/ports/games/abuse_sdl/files/patch-Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile.in --- abuse_sdl/files/patch-Makefile.in 11 May 2002 21:57:40 -0000 1.1 +++ abuse_sdl/files/patch-Makefile.in 5 Nov 2009 02:24:23 -0000 @@ -1,11 +1,11 @@ ---- Makefile.in.orig Sat May 11 22:58:44 2002 -+++ Makefile.in Sat May 11 23:00:15 2002 -@@ -84,7 +84,7 @@ - - man_MANS = abuse-sdl.6 - +--- Makefile.in.old 2009-11-04 19:47:10.000000000 -0600 ++++ Makefile.in 2009-11-04 19:48:20.000000000 -0600 +@@ -201,7 +201,7 @@ + top_srcdir = @top_srcdir@ + SUBDIRS = src + man_MANS = abuse.6 -datafiledir = $(datadir)/games/abuse +datafiledir = $(datadir)/abuse_sdl datafile_DATA = abuse.bmp abuse.lsp abuse.png - - EXTRA_DIST = abuse-sdl.6 abuse.bmp abuse.lsp abuse.png + EXTRA_DIST = bootstrap abuse.6 abuse.bmp abuse.lsp abuse.png + all: config.h Index: abuse_sdl/files/patch-imlib-jmalloc.hpp =================================================================== RCS file: abuse_sdl/files/patch-imlib-jmalloc.hpp diff -N abuse_sdl/files/patch-imlib-jmalloc.hpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ abuse_sdl/files/patch-imlib-jmalloc.hpp 5 Nov 2009 02:24:23 -0000 @@ -0,0 +1,10 @@ +--- src/imlib/jmalloc.hpp.old 2009-11-04 20:07:54.000000000 -0600 ++++ src/imlib/jmalloc.hpp 2009-11-04 20:08:16.000000000 -0600 +@@ -12,6 +12,7 @@ + + + #include ++#include + + #ifdef MANAGE_MEM + enum {ALLOC_SPACE_STATIC,ALLOC_SPACE_CACHE}; --------------010809050609020204050706--