From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 20 17:10:20 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B715F16A420 for ; Thu, 20 Oct 2005 17:10:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9B4443D72 for ; Thu, 20 Oct 2005 17:10:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9KHAF8c048332 for ; Thu, 20 Oct 2005 17:10:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9KHAFaI048331; Thu, 20 Oct 2005 17:10:15 GMT (envelope-from gnats) Resent-Date: Thu, 20 Oct 2005 17:10:15 GMT Resent-Message-Id: <200510201710.j9KHAFaI048331@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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 72AFC16A421 for ; Thu, 20 Oct 2005 17:01:06 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from hfep07.dion.ne.jp (hfep07.dion.ne.jp [203.181.105.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFCAC43D64 for ; Thu, 20 Oct 2005 17:01:05 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([219.108.136.209]) by hfep07.dion.ne.jp with SMTP id <20051020170101558.DBIR@hfep07.dion.ne.jp> for ; Fri, 21 Oct 2005 02:01:01 +0900 Message-Id: <20051021020016.11003a44.tkato432@yahoo.com> Date: Fri, 21 Oct 2005 02:00:16 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/87738: Update port: games/xteddy to 1.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, 20 Oct 2005 17:10:20 -0000 >Number: 87738 >Category: ports >Synopsis: Update port: games/xteddy to 1.1 >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: Thu Oct 20 17:10:15 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p13 i386 >Organization: >Environment: >Description: - Update to version 1.1 New file: pkg-plist Remove file: files/patch-aa files/patch-ab files/patch-ac >How-To-Repeat: >Fix: diff -urN /usr/ports/games/xteddy/Makefile games/xteddy/Makefile --- /usr/ports/games/xteddy/Makefile Mon Oct 10 14:51:58 2005 +++ games/xteddy/Makefile Thu Oct 20 02:08:55 2005 @@ -6,24 +6,29 @@ # PORTNAME= xteddy -PORTVERSION= 1.0 +PORTVERSION= 1.1 CATEGORIES= games -MASTER_SITES= # disappeared +MASTER_SITES= http://www.itn.liu.se/~stegu/xteddy/ MAINTAINER= ports@FreeBSD.org COMMENT= A cuddlesome teddy for the X desktop -BROKEN= "does not fetch" -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2005-12-09 - NO_CDROM= "Can only be distributed for free" -USE_IMAKE= yes -USE_XPM= yes +USE_X_PREFIX= yes +USE_REINPLACE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ + LDFLAGS="-L${X11BASE}/lib" + MAN1= xteddy.1 -PLIST_FILES= bin/xteddy -post-install: - ${STRIP_CMD} ${PREFIX}/bin/xteddy +post-patch: +.for file in configure Makefile.in xteddy.1 + @${REINPLACE_CMD} -e 's|include/X11|share/xteddy|g' ${WRKSRC}/${file} +.endfor + +pre-install: + @${MKDIR} ${DATADIR}/pixmaps + .include diff -urN /usr/ports/games/xteddy/distinfo games/xteddy/distinfo --- /usr/ports/games/xteddy/distinfo Wed Mar 31 18:08:03 2004 +++ games/xteddy/distinfo Sun Oct 16 12:56:55 2005 @@ -1,2 +1,2 @@ -MD5 (xteddy-1.0.tar.gz) = ec01c374400d56536137e2f3bffd3f25 -SIZE (xteddy-1.0.tar.gz) = 42279 +MD5 (xteddy-1.1.tar.gz) = 24a91f882f9113cbbc1c1d44b00f6d61 +SIZE (xteddy-1.1.tar.gz) = 117141 diff -urN /usr/ports/games/xteddy/files/patch-aa games/xteddy/files/patch-aa --- /usr/ports/games/xteddy/files/patch-aa Tue Jun 30 22:16:14 1998 +++ games/xteddy/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- Imakefile.orig Mon Jan 31 20:12:14 1994 -+++ Imakefile Wed Jun 3 17:14:29 1998 -@@ -1,6 +1,6 @@ - SYS_LIBRARIES = -lX11 -lXext -- EXTRA_INCLUDES = -I$(HOME)/include/X11 --EXTRA_LIBRARIES = -L$(HOME)/lib -lXpm -+ EXTRA_INCLUDES = -I$(INCROOT)/X11 -+EXTRA_LIBRARIES = -L$(USRLIBDIR) -lXpm - SRCS = xteddy.c - OBJS = xteddy.o - diff -urN /usr/ports/games/xteddy/files/patch-ab games/xteddy/files/patch-ab --- /usr/ports/games/xteddy/files/patch-ab Tue Jun 30 22:16:14 1998 +++ games/xteddy/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,16 +0,0 @@ ---- xteddy.man.orig Wed Jun 3 17:23:30 1998 -+++ xteddy.man Wed Jun 3 17:08:40 1998 -@@ -0,0 +1,13 @@ -+.Dd Jun 03, 1998 -+.Dt XTEDDY 1 -+.Os -+.Sh NAME -+.Nm xteddy -+.Nd shows a cuddlesome teddy on the X desktop -+.Sh SYNOPSIS -+.Nm xteddy -+.Sh DESCRIPTION -+.Nm xteddy -+shows a very cuddlesome teddy on the X desktop. The teddy can be removed -+by moving the mouse cursor over the teddy and typing "q" or "Q". But it's -+not advised to do that. diff -urN /usr/ports/games/xteddy/files/patch-ac games/xteddy/files/patch-ac --- /usr/ports/games/xteddy/files/patch-ac Tue Jun 30 22:16:14 1998 +++ games/xteddy/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,37 +0,0 @@ ---- xteddy.c.orig Mon Jan 31 20:12:15 1994 -+++ xteddy.c Wed Jun 3 17:09:27 1998 -@@ -19,7 +19,7 @@ - #include - - #ifndef NOXPM --#include -+#include - #endif - - #include -@@ -33,6 +33,14 @@ - #include "xteddy_color.xpm" - #endif - -+#ifndef TRUE -+#define TRUE 1 -+#endif /* TRUE */ -+ -+#ifndef FALSE -+#define FALSE 0 -+#endif /* FALSE */ -+ - #include "patchlevel.h" - - static char *progname; -@@ -335,8 +343,8 @@ - break; - case KeyPress: - /* Exit on "q" or "Q" */ -- charcount = XLookupString(&report, buffer, bufsize, -- &keysym, &compose); -+ charcount = XLookupString(&report.xkey, -+ buffer, bufsize, &keysym, &compose); - if((keysym == XK_Q) || (keysym == XK_q)) - { - XCloseDisplay(display); diff -urN /usr/ports/games/xteddy/pkg-descr games/xteddy/pkg-descr --- /usr/ports/games/xteddy/pkg-descr Tue Jun 30 22:16:15 1998 +++ games/xteddy/pkg-descr Sun Oct 16 13:32:35 2005 @@ -1,8 +1,4 @@ This is _the_ toy for the X desktop, a must for all plush lovers: a very, very cuddlesome teddy. -Thanks to Felix Schroeter (felix@openbsd.org) for helpful hints to create -this port. - -- Eckart Hofmann -Isegrim@Wunder-Nett.org +WWW: http://www.itn.liu.se/~stegu/xteddy/ diff -urN /usr/ports/games/xteddy/pkg-plist games/xteddy/pkg-plist --- /usr/ports/games/xteddy/pkg-plist Thu Jan 1 09:00:00 1970 +++ games/xteddy/pkg-plist Sun Oct 16 13:13:14 2005 @@ -0,0 +1,15 @@ +bin/xteddy +%%DATADIR%%/pixmaps/teddy_bw.xbm +%%DATADIR%%/pixmaps/teddy_color.xpm +%%DATADIR%%/pixmaps/teddy_icon.xbm +%%DATADIR%%/pixmaps/teddy_mask.xbm +%%DATADIR%%/pixmaps/xpenguin_bw.xbm +%%DATADIR%%/pixmaps/xpenguin_color.xpm +%%DATADIR%%/pixmaps/xpenguin_icon.xbm +%%DATADIR%%/pixmaps/xpenguin_mask.xbm +%%DATADIR%%/pixmaps/xteddy_bw.xbm +%%DATADIR%%/pixmaps/xteddy_color.xpm +%%DATADIR%%/pixmaps/xteddy_icon.xbm +%%DATADIR%%/pixmaps/xteddy_mask.xbm +@dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: