From owner-freebsd-ports  Fri Oct 13 18:10:11 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 1FED837B671
	for <freebsd-ports@FreeBSD.org>; Fri, 13 Oct 2000 18:10:02 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id SAA66240;
	Fri, 13 Oct 2000 18:10:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A798937B66D; Fri, 13 Oct 2000 18:05:18 -0700 (PDT)
Message-Id: <20001014010518.A798937B66D@hub.freebsd.org>
Date: Fri, 13 Oct 2000 18:05:18 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/21968: Update port: games/wmtimebomb
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         21968
>Category:       ports
>Synopsis:       Update port: games/wmtimebomb
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 13 18:10:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix Imakefile breakage under XFree86 4.x

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/games/wmtimebomb/Makefile games/wmtimebomb/Makefile
--- /usr/ports/games/wmtimebomb/Makefile	Sat Apr 15 00:24:08 2000
+++ games/wmtimebomb/Makefile	Sat Oct 14 03:25:19 2000
@@ -19,9 +19,6 @@
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
 
-post-patch:
-	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Imakefile
-
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/wmtimebomb
 	${INSTALL_DATA} ${WRKSRC}/example.modefile ${PREFIX}/lib/X11/wmtimebomb
diff -urN /usr/ports/games/wmtimebomb/files/patch-aa games/wmtimebomb/files/patch-aa
--- /usr/ports/games/wmtimebomb/files/patch-aa	Fri Feb 18 12:36:30 2000
+++ games/wmtimebomb/files/patch-aa	Sat Oct 14 03:28:07 2000
@@ -1,14 +1,18 @@
 --- Imakefile.orig	Mon Nov 16 21:40:24 1998
-+++ Imakefile	Thu Feb 17 23:02:07 2000
-@@ -1,7 +1,9 @@
--XPMLIB = -L/usr/X11R6/lib -lXpm -lm -ljpeg -lpng -lz -ltiff -lungif
++++ Imakefile	Sat Oct 14 03:27:50 2000
+@@ -1,10 +1,12 @@
+-XPMLIB = -L/usr/X11R6/lib -lXpm -lm -ljpeg -lpng -lz -ltiff -lgif
 -WMAKER = -L/usr/local/lib -lWMaker -lWINGs -lwraster -lPropList
-+XPMLIB = `get-wraster-flags --libs`
-+WMAKER = -lWMaker -lWINGs -lPropList -L%%LOCALBASE%%/lib
++XPMLIB = `get-wraster-flags --ldflags` `get-wraster-flags --libs`
++WMAKER = -lWMaker -lWINGs -lPropList -L${LOCALBASE}/lib
   
  LOCAL_LIBRARIES = $(WMAKER) $(XPMLIB) $(XLIB)
-+
-+EXTRA_INCLUDES= `get-wraster-flags --cflags` -I%%LOCALBASE%%/include
  
++EXTRA_INCLUDES= `get-wraster-flags --cflags` -I${LOCALBASE}/include
++
  SRCS = timebomb.c
  OBJS = timebomb.o
+ 
+-ComplexProgramTarget(wmtimebomb)
++ComplexProgramTargetNoMan(wmtimebomb)
+ 


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message