aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/qt145
diff options
context:
space:
mode:
authorAndreas Klemm <andreas@FreeBSD.org>1999-02-25 08:25:17 +0000
committerAndreas Klemm <andreas@FreeBSD.org>1999-02-25 08:25:17 +0000
commit4b5759cc15bbd63e1c4de4a46ae2005f912e47dd (patch)
treeba4a770668df57e814faefae872cabdf2b716c4e /x11-toolkits/qt145
parent22763d099ffa1c0644045b58e7fe18a265b009e7 (diff)
downloadports-4b5759cc15bbd63e1c4de4a46ae2005f912e47dd.tar.gz
ports-4b5759cc15bbd63e1c4de4a46ae2005f912e47dd.zip
Notes
Diffstat (limited to 'x11-toolkits/qt145')
-rw-r--r--x11-toolkits/qt145/Makefile4
-rw-r--r--x11-toolkits/qt145/files/patch-aa58
2 files changed, 52 insertions, 10 deletions
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index 87a25eb27126..162e9358e2e7 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 Jul 1996
# Whom: searle@longacre.demon.co.uk
#
-# $Id: Makefile,v 1.29 1998/11/23 17:41:10 andreas Exp $
+# $Id: Makefile,v 1.30 1999/01/07 10:58:31 asami Exp $
#
DISTNAME= qt-1.42
@@ -16,7 +16,7 @@ LIB_DEPENDS= MesaGL.14:${PORTSDIR}/graphics/Mesa3
USE_GMAKE= yes
USE_X_PREFIX= yes
-MAKE_ENV= QTDIR=${WRKSRC}
+MAKE_ENV+= QTDIR=${WRKSRC} CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
.include <bsd.port.pre.mk>
diff --git a/x11-toolkits/qt145/files/patch-aa b/x11-toolkits/qt145/files/patch-aa
index aabb438685c3..bfe1af96de47 100644
--- a/x11-toolkits/qt145/files/patch-aa
+++ b/x11-toolkits/qt145/files/patch-aa
@@ -1,9 +1,48 @@
---- ./configs/freebsd-g++-shared.org Tue Nov 17 06:19:01 1998
-+++ ./configs/freebsd-g++-shared Wed Jan 6 23:49:34 1999
-@@ -40,15 +44,26 @@
+--- configs/freebsd-g++-shared.orig Tue Nov 17 15:19:01 1998
++++ configs/freebsd-g++-shared Thu Feb 25 09:03:29 1999
+@@ -1,30 +1,30 @@
+ # Compiling
+-SYSCONF_CC = g++
++SYSCONF_CC = $(CXX)
+
+ # Compiling with support libraries
+-SYSCONF_CFLAGS_X11 = -I/usr/X11R6/include
++SYSCONF_CFLAGS_X11 = -I$(X11BASE)/include
+ SYSCONF_CFLAGS_QT = -I$(QTDIR)/include
+-SYSCONF_CFLAGS_OPENGL = -I/usr/X11R6/include
++SYSCONF_CFLAGS_OPENGL = -I$(X11BASE)/include
+
+ # Compiline YACC output
+ SYSCONF_CFLAGS_YACC = -Wno-unused -Wno-parentheses
+
+ # Linking with support libraries
+ # X11
+-SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
++SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib
+ SYSCONF_LIBS_X11 = -lX11 -lXext
+ # Qt, Qt+OpenGL
+ SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
+ SYSCONF_LIBS_QT = -lqt
+ SYSCONF_LIBS_QT_OPENGL = -lqgl
+ # OpenGL
+-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
++SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
+ SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXext -lm
+ # Yacc
+ SYSCONF_LIBS_YACC =
+
+ # Linking applications
+-SYSCONF_LINK = g++
++SYSCONF_LINK = $(CXX)
+ SYSCONF_LFLAGS =
+ SYSCONF_LIBS =
+
+@@ -39,16 +39,27 @@
+ # - Place target in $(DESTDIR) - which has a trailing /
# - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
#
- SYSCONF_LINK_SHLIB = g++
+-SYSCONF_LINK_SHLIB = g++
++SYSCONF_LINK_SHLIB = $(CXX)
+ifeq ($(PORTOBJFORMAT),elf)
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
@@ -30,15 +69,18 @@
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -61,9 +76,9 @@
+@@ -59,11 +70,11 @@
+ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
# Compiling application source
- SYSCONF_CFLAGS = -pipe -O2 -fno-strength-reduce
+-SYSCONF_CFLAGS = -pipe -O2 -fno-strength-reduce
++SYSCONF_CFLAGS = $(CXXFLAGS) -fno-strength-reduce
# Compiling library source
-SYSCONF_CFLAGS_LIB = -O2 -fno-strength-reduce -fPIC
-+SYSCONF_CFLAGS_LIB = -pipe -O2 -fno-strength-reduce -fPIC
++SYSCONF_CFLAGS_LIB = $(CXXFLAGS) -fno-strength-reduce -fPIC
# Compiling shared-object source
-SYSCONF_CFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC
-+SYSCONF_CFLAGS_SHOBJ = -pipe -O2 -fno-strength-reduce -fPIC
++SYSCONF_CFLAGS_SHOBJ = $(CXXFLAGS) -fno-strength-reduce -fPIC
# Default link type (stati linking is still be used where required)
SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)