From df84103450bd193f1547c11489fd3ee360429232 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 2 Jul 2010 16:48:54 +0000 Subject: Drop a 6 year old patch that doesn't make any sense at all and breaks compilation with LP64. DESTDIR ready. Bump revision. --- games/openmortal/Makefile | 6 ++++-- games/openmortal/distinfo | 4 ++-- games/openmortal/patches/patch-aa | 15 +-------------- 3 files changed, 7 insertions(+), 18 deletions(-) (limited to 'games/openmortal') diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile index 292c1478e17..5f96495e1eb 100644 --- a/games/openmortal/Makefile +++ b/games/openmortal/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:22 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2010/07/02 16:48:54 joerg Exp $ # DISTNAME= openmortal-0.7 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openmortal/} EXTRACT_SUFX= .tar.bz2 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://apocalypse.rulez.org/~upi/Mortal/ COMMENT= Parody of Mortal Kombat with real characters +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_TOOLS+= gmake diff --git a/games/openmortal/distinfo b/games/openmortal/distinfo index b4db1da4fab..315588e3ca2 100644 --- a/games/openmortal/distinfo +++ b/games/openmortal/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2007/08/08 20:53:47 joerg Exp $ +$NetBSD: distinfo,v 1.11 2010/07/02 16:48:54 joerg Exp $ SHA1 (openmortal-0.7.tar.bz2) = a7177012e1c0eb04f357aa9ff013e53c8f7b835c RMD160 (openmortal-0.7.tar.bz2) = 6a0fdd46445ed243db261227a93526b97c6f9d79 Size (openmortal-0.7.tar.bz2) = 51197736 bytes -SHA1 (patch-aa) = d18089a348fb7718bed0f47fbff7aaf772915340 +SHA1 (patch-aa) = 8f9438695de1dd8fcb0e68f6cee9ee8efd2229c3 SHA1 (patch-ab) = 1f7f9075975994e76262df4d3153f1162cb40dd3 SHA1 (patch-ac) = 807cfb849a4a3408c5877b61690bf0cf37da59b6 SHA1 (patch-ad) = ad0fbd55c11a6076e9e5212b717a4b220820b206 diff --git a/games/openmortal/patches/patch-aa b/games/openmortal/patches/patch-aa index 963d3dd4098..03afb515f5c 100644 --- a/games/openmortal/patches/patch-aa +++ b/games/openmortal/patches/patch-aa @@ -1,20 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2004/03/06 17:32:11 xtraeme Exp $ +$NetBSD: patch-aa,v 1.3 2010/07/02 16:48:54 joerg Exp $ --- src/State.cpp.orig 2004-03-06 18:20:58.000000000 +0100 +++ src/State.cpp 2004-03-06 18:22:07.000000000 +0100 -@@ -151,10 +151,10 @@ - debug( "GetUserName failed: %d.\n", iResult ); - } - #else -- int iResult = getlogin_r( m_acNick, 127 ); -+ int iResult = (int)getlogin(); - if ( iResult ) - { -- debug( "getlogin_r failed: %d\n", iResult ); -+ debug( "getlogin failed: %d\n", iResult ); - strcpy( m_acNick, getenv("USER") ); - } - #endif @@ -273,7 +273,11 @@ void SState::Save() { -- cgit v1.2.3