From owner-freebsd-ports  Sun Oct 29  1:10: 5 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 67E4837B4C5
	for <freebsd-ports@FreeBSD.org>; Sun, 29 Oct 2000 01:10:02 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id BAA29839;
	Sun, 29 Oct 2000 01:10:02 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from arthur.cs.uni-magdeburg.de (arthur.CS.Uni-Magdeburg.De [141.44.27.36])
	by hub.freebsd.org (Postfix) with ESMTP id DBD4937B479
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 29 Oct 2000 01:08:44 -0800 (PST)
Received: (from r@localhost)
	by arthur.cs.uni-magdeburg.de (8.11.0/8.11.0) id e9T9CN605459;
	Sun, 29 Oct 2000 10:12:23 +0100 (CET)
	(envelope-from r)
Message-Id: <200010290912.e9T9CN605459@arthur.cs.uni-magdeburg.de>
Date: Sun, 29 Oct 2000 10:12:23 +0100 (CET)
From: Roland Jesse <jesse@cs.uni-magdeburg.de>
Reply-To: Roland Jesse <jesse@cs.uni-magdeburg.de>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/22390: Fix devel/tmake (SUPERCEDES pr 22389)
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         22390
>Category:       ports
>Synopsis:       Fix devel/tmake: It is intended for use with Qt 2
>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:   Sun Oct 29 01:10:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Roland Jesse
>Release:        FreeBSD 4.1-STABLE i386
>Organization:
Otto-von-Guericke University Magdeburg
>Environment:
FreeBSD arthur.cs.uni-magdeburg.de 4.1-STABLE FreeBSD 4.1-STABLE #0: Fri Sep 22 13:46:37 CEST 2000     root@arthur.cs.uni-magdeburg.de:/usr/obj/usr/src/sys/ARTHUR  i386
>Description:
The port was missing Qt2 as a requirement and one of the patches was
pointing to Qt 1 includes and libs instead Qt 2 includes and libs.

PR 22389 was missing the patch for TMAKE_LIBS_QT and
TMAKE_LIBS_QT_THREAD. Sorry.
>How-To-Repeat:
n/a
>Fix:
diff -ruN tmake.bak/Makefile tmake/Makefile
--- tmake.bak/Makefile	Sat Sep  2 15:34:39 2000
+++ tmake/Makefile	Sun Oct 29 09:47:06 2000
@@ -13,6 +13,7 @@
 MAINTAINER=	jesse@cs.uni-magdeburg.de
 
 USE_PERL5=	yes
+USE_QT2=	yes
 NO_BUILD=       yes
 TMAKE_BIN=	progen tmake
 
diff -ruN tmake.bak/files/patch-ab tmake/files/patch-ab
--- tmake.bak/files/patch-ab	Sat Sep  2 15:32:27 2000
+++ tmake/files/patch-ab	Sun Oct 29 10:05:53 2000
@@ -1,11 +1,22 @@
---- lib/freebsd-g++/tmake.conf	Wed Aug 23 18:03:32 2000
-+++ lib/freebsd-g++/tmake.conf.new	Fri Sep  1 17:09:54 2000
+--- lib/freebsd-g++/tmake.conf.orig	Wed Aug 23 18:03:32 2000
++++ lib/freebsd-g++/tmake.conf	Sun Oct 29 10:03:53 2000
 @@ -31,7 +31,7 @@
  TMAKE_LIBDIR		= /usr/local/lib
  TMAKE_INCDIR_X11	= /usr/X11R6/include
  TMAKE_LIBDIR_X11	= /usr/X11R6/lib
 -TMAKE_INCDIR_QT		= $(QTDIR)/include
-+TMAKE_INCDIR_QT		= $(QTDIR)/include/qt
++TMAKE_INCDIR_QT		= $(QTDIR)/include/qt2
  TMAKE_LIBDIR_QT		= $(QTDIR)/lib
  TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
  TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+@@ -51,8 +51,8 @@
+ TMAKE_LIBS		=
+ TMAKE_LIBS_X11		= -lXext -lX11 -lm
+ TMAKE_LIBS_X11SM	= -lICE -lSM
+-TMAKE_LIBS_QT		= -lqt
+-TMAKE_LIBS_QT_THREAD	= -lqt-mt
++TMAKE_LIBS_QT		= -lqt2
++TMAKE_LIBS_QT_THREAD	= -lqt2-mt
+ TMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
+ TMAKE_LIBS_THREAD	= 
+ 

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


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