From owner-freebsd-ports Sat Oct 5 1:10:19 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8677837B407 for ; Sat, 5 Oct 2002 01:10:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85C2D43E77 for ; Sat, 5 Oct 2002 01:10:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g958A3Co013818 for ; Sat, 5 Oct 2002 01:10:03 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g958A3Iu013817; Sat, 5 Oct 2002 01:10:03 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 986C737B401 for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/43686: Update port: x11/tycoon Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 43686 >Category: ports >Synopsis: Update port: x11/tycoon >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: Sat Oct 05 01:10:03 PDT 2002 >Closed-Date: >Last-Modified: >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 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: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message