Properly OpenBSDized Qt2 configuration.

This commit is contained in:
naddy 2002-04-09 15:32:12 +00:00
parent 4e348bcccd
commit 581d2d4df0
3 changed files with 102 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2002/02/28 14:15:31 naddy Exp $
# $OpenBSD: Makefile,v 1.2 2002/04/09 15:32:12 naddy Exp $
COMMENT= "Cross-platform makefile tool from TrollTech"
@ -20,7 +20,21 @@ MASTER_SITES= ftp://ftp.trolltech.com/freebies/tmake/
NO_BUILD= Yes
NO_REGRESS= Yes
MODULES= qt2
RUN_DEPENDS= ::x11/qt2-designer
do-install:
@perl -pi \
-e 's|%%CC%%|${CC}|g;' \
-e 's|%%CFLAGS%%|${CFLAGS}|g;' \
-e 's|%%CXX%%|${CXX}|g;' \
-e 's|%%CXXFLAGS%%|${CXXFLAGS}|g;' \
-e 's|%%LOCALBASE%%|${LOCALBASE}|g;' \
-e 's|%%MODQT_INCDIR%%|${MODQT_INCDIR}|g;' \
-e 's|%%MODQT_LIBDIR%%|${MODQT_LIBDIR}|g;' \
-e 's|%%MODQT_MOC%%|${MODQT_MOC}|g;' \
-e 's|%%X11BASE%%|${X11BASE}|g;' \
${WRKSRC}/lib/openbsd-g++/tmake.conf
@perl -pi -e 's:%%PREFIX%%:${TRUEPREFIX}:' ${WRKSRC}/bin/tmake
${INSTALL_SCRIPT} ${WRKSRC}/bin/tmake ${PREFIX}/bin/tmake
${INSTALL_SCRIPT} ${WRKSRC}/bin/progen ${PREFIX}/bin/progen

View File

@ -0,0 +1,75 @@
$OpenBSD: patch-lib_openbsd-g++_tmake_conf,v 1.1 2002/04/09 15:32:13 naddy Exp $
--- lib/openbsd-g++/tmake.conf.orig Mon Oct 15 02:49:58 2001
+++ lib/openbsd-g++/tmake.conf Tue Apr 9 17:18:33 2002
@@ -7,52 +7,51 @@
TEMPLATE = app
CONFIG = qt warn_on release
-TMAKE_CC = gcc
+TMAKE_CC = %%CC%%
TMAKE_CFLAGS =
TMAKE_CFLAGS_WARN_ON = -Wall -W
TMAKE_CFLAGS_WARN_OFF =
-TMAKE_CFLAGS_RELEASE = -O2
+TMAKE_CFLAGS_RELEASE = %%CFLAGS%%
TMAKE_CFLAGS_DEBUG = -g
TMAKE_CFLAGS_SHLIB = -fPIC
TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
-TMAKE_CXX = g++
+TMAKE_CXX = %%CXX%%
TMAKE_CXXFLAGS = $$TMAKE_CFLAGS
TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON
TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE
+TMAKE_CXXFLAGS_RELEASE = %%CXXFLAGS%%
TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG
TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB
TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC
TMAKE_INCDIR =
TMAKE_LIBDIR =
-TMAKE_INCDIR_X11 = /usr/X11R6/include
-TMAKE_LIBDIR_X11 = /usr/X11R6/lib
-TMAKE_INCDIR_QT = $(QTDIR)/include
-TMAKE_LIBDIR_QT = $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL = /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-
-TMAKE_LINK = g++
-TMAKE_LINK_SHLIB = ld
-TMAKE_LINK_SHLIB_CMD = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) \
- `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | \
- tsort` $(LIBS)
+TMAKE_INCDIR_X11 = %%X11BASE%%/include
+TMAKE_LIBDIR_X11 = %%X11BASE%%/lib
+TMAKE_INCDIR_QT = %%MODQT_INCDIR%%
+TMAKE_LIBDIR_QT = %%MODQT_LIBDIR%%
+TMAKE_LIBDIR_QT_EXTRA = %%LOCALBASE%%/lib
+TMAKE_INCDIR_OPENGL = %%X11BASE%%/include
+TMAKE_LIBDIR_OPENGL = %%X11BASE%%/lib
+
+TMAKE_LINK = $$TMAKE_CXX
+TMAKE_LINK_SHLIB = $$TMAKE_CXX
+TMAKE_LINK_SHLIB_CMD = $$TMAKE_LINK_SHLIB $$TMAKE_LFLAGS_SHLIB $(LFLAGS) -o $(DESTDIR)$(TARGET_x.y) $(OBJECTS) $(OBJMOC) $(LIBS)
TMAKE_LFLAGS =
TMAKE_LFLAGS_RELEASE =
TMAKE_LFLAGS_DEBUG =
-TMAKE_LFLAGS_SHLIB = -Bshareable
+TMAKE_LFLAGS_SHLIB = -shared -fPIC
TMAKE_LFLAGS_SONAME =
TMAKE_LIBS =
TMAKE_LIBS_X11 = -lXext -lX11 -lm
-TMAKE_LIBS_QT = -lqt
+TMAKE_LIBS_QT = -lqt -lpng
TMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
-TMAKE_MOC = $(QTDIR)/bin/moc
-TMAKE_UIC = $(QTDIR)/bin/uic
+TMAKE_MOC = %%MODQT_MOC%%
+TMAKE_UIC = %%LOCALBASE%%/bin/uic
TMAKE_AR = ar q
TMAKE_RANLIB = ranlib

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_unix_generic_t,v 1.1 2002/04/09 15:32:13 naddy Exp $
--- lib/unix/generic.t.orig Tue Apr 9 17:20:08 2002
+++ lib/unix/generic.t Tue Apr 9 17:21:32 2002
@@ -65,6 +65,8 @@
Project("TMAKE_LIB_FLAG")) ) {
Project("TMAKE_LIBDIR_QT") &&
Project('TMAKE_LIBDIR_FLAGS *= -L$$TMAKE_LIBDIR_QT');
+ Project("TMAKE_LIBDIR_QT_EXTRA") &&
+ Project('TMAKE_LIBDIR_FLAGS *= -L$$TMAKE_LIBDIR_QT_EXTRA');
if (Config("thread") && Project("TMAKE_LIBS_QT_THREAD")) {
Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_THREAD');
} else {