From owner-svn-ports-all@FreeBSD.ORG Fri May 31 14:18:21 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]) by hub.freebsd.org (Postfix) with ESMTP id 6FC53C51; Fri, 31 May 2013 14:18:21 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 523C36E4; Fri, 31 May 2013 14:18:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4VEILU1018679; Fri, 31 May 2013 14:18:21 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4VEIKC6018673; Fri, 31 May 2013 14:18:20 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201305311418.r4VEIKC6018673@svn.freebsd.org> From: Antoine Brodin Date: Fri, 31 May 2013 14:18:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319494 - in head/games/xpipeman: . 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: Fri, 31 May 2013 14:18:21 -0000 Author: antoine Date: Fri May 31 14:18:20 2013 New Revision: 319494 URL: http://svnweb.freebsd.org/changeset/ports/319494 Log: - Trim Makefile header - Unbreak with clang - Respect PREFIX Approved by: miwi, eadler (mentors, implicit) Modified: head/games/xpipeman/Makefile head/games/xpipeman/files/patch-ab head/games/xpipeman/files/patch-ac Modified: head/games/xpipeman/Makefile ============================================================================== --- head/games/xpipeman/Makefile Fri May 31 14:04:11 2013 (r319493) +++ head/games/xpipeman/Makefile Fri May 31 14:18:20 2013 (r319494) @@ -1,15 +1,11 @@ -# New ports collection makefile for: xpipeman -# Date created: 2 Jan 1995 -# Whom: swallace -# +# Created by: swallace # $FreeBSD$ -# PORTNAME= xpipeman PORTVERSION= 1.0 PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SUNSITE} +MASTER_SITES= SUNSITE MASTER_SITE_SUBDIR= games/strategy DISTNAME= ${PORTNAME} EXTRACT_SUFX= .tar.Z @@ -23,8 +19,14 @@ ONLY_FOR_ARCHS= i386 amd64 USE_IMAKE= yes USE_XORG= x11 xaw xext xmu xt sm ice MAN6= xpipeman.6 - -post-install: +MANCOMPRESSED= no +CFLAGS+= -Wno-error=return-type +BINGRP= games +BINMODE= 2555 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/xpipeman ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${MANPREFIX}/man/man6/xpipeman.6 ${INSTALL} -c -g games -m 664 ${FILESDIR}/xpipescores ${PREFIX}/lib/X11 .include Modified: head/games/xpipeman/files/patch-ab ============================================================================== --- head/games/xpipeman/files/patch-ab Fri May 31 14:04:11 2013 (r319493) +++ head/games/xpipeman/files/patch-ab Fri May 31 14:18:20 2013 (r319494) @@ -1,9 +1,9 @@ ---- Imakefile.orig Tue Jul 28 19:56:27 1992 -+++ Imakefile Mon Jul 22 14:05:57 2002 +--- ./Imakefile.orig 1992-07-28 23:56:27.000000000 +0000 ++++ ./Imakefile 2013-05-31 12:26:22.000000000 +0000 @@ -1,7 +1,7 @@ - SCORE_FILE = -DSCORE_FILE=\"/usr/games/lib/xpipescores\" -+ SCORE_FILE = -DSCORE_FILE=\"$(LIBDIR)/xpipescores\" ++ SCORE_FILE = -DSCORE_FILE=\"$(PREFIX)/lib/X11/xpipescores\" MAXSCORES = -DMAXSCORES=20 - DEFINES = $(SCORE_FILE) $(MAXSCORES) -DSYSV + DEFINES = $(SCORE_FILE) $(MAXSCORES) Modified: head/games/xpipeman/files/patch-ac ============================================================================== --- head/games/xpipeman/files/patch-ac Fri May 31 14:04:11 2013 (r319493) +++ head/games/xpipeman/files/patch-ac Fri May 31 14:18:20 2013 (r319494) @@ -1,6 +1,6 @@ ---- main.c.orig 2011-02-02 19:11:34.000000000 +0100 -+++ main.c 2011-01-24 17:44:29.000000000 +0100 -@@ -146,16 +146,6 @@ +--- ./main.c.orig 1991-09-13 20:32:10.000000000 +0000 ++++ ./main.c 2013-05-31 10:39:59.000000000 +0000 +@@ -146,21 +146,11 @@ {"-scorefile","scorefile",XrmoptionSepArg, NULL }, }; @@ -17,6 +17,12 @@ /*----------------------------------------------------------------------*/ + main(argc, argv) +- unsigned int argc; ++ int argc; + char **argv; + { + Arg args[1]; @@ -168,6 +158,17 @@ Widget quit_command, new_game_command;