From nobody@FreeBSD.org  Sat Oct  5 01:02:30 2002
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 986C737B401
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  5 Oct 2002 01:02:30 -0700 (PDT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4678F43E6E
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  5 Oct 2002 01:02:30 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.6/8.12.6) with ESMTP id g9582U7R054305
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 5 Oct 2002 01:02:30 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.6/8.12.6/Submit) id g9582ULp054304;
	Sat, 5 Oct 2002 01:02:30 -0700 (PDT)
Message-Id: <200210050802.g9582ULp054304@www.freebsd.org>
Date: Sat, 5 Oct 2002 01:02:30 -0700 (PDT)
From: KATO Tsuguru <tkato@prontomail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: x11/tycoon
X-Send-Pr-Version: www-1.0

>Number:         43686
>Category:       ports
>Synopsis:       Update port: x11/tycoon
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 05 01:10:03 PDT 2002
>Closed-Date:    Tue Oct 08 18:41:20 PDT 2002
>Last-Modified:  Tue Oct 08 18:41:20 PDT 2002
>Originator:     KATO Tsuguru
>Release:        4.6.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11/tycoon/Makefile x11/tycoon/Makefile
--- /usr/ports/x11/tycoon/Makefile	Tue Sep 10 20:33:20 2002
+++ x11/tycoon/Makefile	Sat Oct  5 16:21:37 2002
@@ -13,15 +13,18 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	xforms:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 
-USE_REINPLACE=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 
-post-build:
-	${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~ ;\
+post-patch:
+	${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~
 	${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \
 		${WRKSRC}/xbackdrop/backdrops/index
+	${FIND} ${WRKSRC} -name '*.c' -type f | ${XARGS} ${REINPLACE_CMD} -e \
+		's,FL_REVISION>=80,FL_REVISION >= 80 || FL_VERSION != 0,g'
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11/tycoon/files/patch-aa x11/tycoon/files/patch-aa
--- /usr/ports/x11/tycoon/files/patch-aa	Sun Dec 31 03:37:03 2000
+++ x11/tycoon/files/patch-aa	Sat Oct  5 15:39:13 2002
@@ -10,12 +10,12 @@
 -XCOMM FOR Solaris
 -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
 +XCOMM FOR FreeBSD
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
++EXTRA_LIBRARIES  = -lforms -lXpm -lm
  
  
 -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
-+EXTRA_INCLUDES  = -I.
++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
diff -urN /usr/ports/x11/tycoon/files/patch-ab x11/tycoon/files/patch-ab
--- /usr/ports/x11/tycoon/files/patch-ab	Sun Dec 31 03:37:03 2000
+++ x11/tycoon/files/patch-ab	Sat Oct  5 15:39:20 2002
@@ -7,7 +7,7 @@
 -EXTRA_LIBRARIES  = -L/usr/local/lib -L/users/matar/interu/segel/mitnits/lib -lXpm
 -EXTRA_INCLUDES  = -I/usr/local/include -I/users/matar/interu/segel/mitnits/lib -I.
 +EXTRA_LIBRARIES  = -lXpm
-+EXTRA_INCLUDES  = -I.
++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
  EXTRA_DEFINES = -DVERSION=\"$(VERSION)\"
  LDLIBS = $(EXTRA_LIBRARIES) $(XAWLIB) $(XMULIB) \
  	$(XTOOLLIB) $(EXTENSIONLIB) $(XLIB) 
diff -urN /usr/ports/x11/tycoon/files/patch-ac x11/tycoon/files/patch-ac
--- /usr/ports/x11/tycoon/files/patch-ac	Mon Jun  4 18:33:50 2001
+++ x11/tycoon/files/patch-ac	Sat Oct  5 15:39:32 2002
@@ -16,11 +16,11 @@
 -XCOMM FOR Solaris
 -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
 +XCOMM FOR FreeBSD
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
++EXTRA_LIBRARIES  = -lforms -lXpm -lm
  
  
 -EXTRA_INCLUDES = -I/usr/local/include -I/u/grad/mitnits/lib -I.
-+EXTRA_INCLUDES = -I.
++EXTRA_INCLUDES = -I. -I${INCDIR}/X11
  EXTRA_DEFINES =  -DXBACKDROP_DIR=\"$(XBACKDROP_DIR)\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
diff -urN /usr/ports/x11/tycoon/files/patch-ad x11/tycoon/files/patch-ad
--- /usr/ports/x11/tycoon/files/patch-ad	Sun Dec 31 03:37:03 2000
+++ x11/tycoon/files/patch-ad	Sat Oct  5 15:39:40 2002
@@ -10,12 +10,12 @@
 -XCOMM FOR Solaris
 -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
 +XCOMM FOR FreeBSD
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
++EXTRA_LIBRARIES  = -lforms -lXpm -lm
  
  
 -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
-+EXTRA_INCLUDES  = -I.
++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
diff -urN /usr/ports/x11/tycoon/files/patch-ae x11/tycoon/files/patch-ae
--- /usr/ports/x11/tycoon/files/patch-ae	Sun Dec 31 03:37:03 2000
+++ x11/tycoon/files/patch-ae	Sat Oct  5 15:39:48 2002
@@ -7,8 +7,8 @@
 -EXTRA_LIBRARIES  = -L/usr/local/lib -lforms -lXpm -lm
 -EXTRA_INCLUDES  = -I/usr/local/include -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
-+EXTRA_INCLUDES  = -I.
++EXTRA_LIBRARIES  = -lforms -lXpm -lm
++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps/\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
diff -urN /usr/ports/x11/tycoon/files/patch-af x11/tycoon/files/patch-af
--- /usr/ports/x11/tycoon/files/patch-af	Sun Dec 31 03:37:03 2000
+++ x11/tycoon/files/patch-af	Sat Oct  5 15:39:56 2002
@@ -10,12 +10,12 @@
 -XCOMM FOR Solaris
 -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
 +XCOMM FOR FreeBSD
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm 
++EXTRA_LIBRARIES  = -lforms -lXpm -lm 
  
  
 -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
-+EXTRA_INCLUDES  = -I.
++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps/\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  

>Release-Note:
>Audit-Trail:

From: Adam Weinberger <adam@vectors.cx>
To: KATO Tsuguru <tkato@prontomail.com>
Cc: freebsd-gnats-submit@FreeBSD.ORG
Subject: Re: ports/43686: Update port: x11/tycoon
Date: Sat, 5 Oct 2002 01:26:50 -0700

 this supercedes PR 43645.
 
 -Adam
State-Changed-From-To: open->closed 
State-Changed-By: pat 
State-Changed-When: Tue Oct 8 18:41:10 PDT 2002 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43686 
>Unformatted:
