From 904f792ffe92844232f1c36349f025ed74c4d799 Mon Sep 17 00:00:00 2001 From: espie Date: Sat, 14 Oct 2006 10:01:09 +0000 Subject: [PATCH] zap duplicate symbol that impairs static linking. This should fix build on vaxen (problem reported by Zachary Kline). --- games/nethack/Makefile | 4 ++-- games/nethack/patches/patch-sys_share_unixtty_c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 games/nethack/patches/patch-sys_share_unixtty_c diff --git a/games/nethack/Makefile b/games/nethack/Makefile index 30b534c5a3d..ce42f0ce589 100644 --- a/games/nethack/Makefile +++ b/games/nethack/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.40 2006/02/11 16:15:46 otto Exp $ +# $OpenBSD: Makefile,v 1.41 2006/10/14 10:01:09 espie Exp $ # $FreeBSD: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $ COMMENT= "dungeon explorin', hackin', game. Piece of cake" V=3.4.3 DISTNAME= nethack-$V -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nethack/} \ diff --git a/games/nethack/patches/patch-sys_share_unixtty_c b/games/nethack/patches/patch-sys_share_unixtty_c new file mode 100644 index 00000000000..f287fc375d3 --- /dev/null +++ b/games/nethack/patches/patch-sys_share_unixtty_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-sys_share_unixtty_c,v 1.1 2006/10/14 10:01:09 espie Exp $ +--- sys/share/unixtty.c.orig Sat Oct 14 11:31:59 2006 ++++ sys/share/unixtty.c Sat Oct 14 11:32:33 2006 +@@ -121,7 +121,7 @@ struct tchars inittyb2, curttyb2; + + #endif /* V7 */ + +-#if defined(TTY_GRAPHICS) && ((!defined(SYSV) && !defined(HPUX)) || defined(UNIXPC) || defined(SVR4)) ++#if defined(TTY_GRAPHICS) && ((!defined(SYSV) && !defined(HPUX)) || defined(UNIXPC) || defined(SVR4)) || defined(__OpenBSD__) + # ifndef LINT + extern /* it is defined in libtermlib (libtermcap) */ + # endif