upgrade to qt2 2.1
This commit is contained in:
parent
6ceaa0d561
commit
9247b86eba
@ -1,12 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2000/09/22 20:50:19 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2000/10/08 06:02:00 brad Exp $
|
||||
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
|
||||
|
||||
DISTNAME= qt-2.2.0
|
||||
PKGNAME= qt2-2.0
|
||||
VERSION= 2.1
|
||||
DISTNAME= qt-2.${VERSION}
|
||||
PKGNAME= qt2-${VERSION}
|
||||
CATEGORIES= x11
|
||||
NEED_VERSION= 1.324
|
||||
NEED_VERSION= 1.336
|
||||
MASTER_SITES= ftp://ftp.troll.no/qt/source/
|
||||
DISTFILES= qt-x11-2.2.0.tar.gz
|
||||
DISTFILES= qt-x11-2.${VERSION}.tar.gz
|
||||
|
||||
HOMEPAGE= http://www.trolltech.com/qt/
|
||||
|
||||
@ -19,8 +20,9 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
USE_X11= Yes
|
||||
USE_GMAKE= Yes
|
||||
MAKE_ENV= QTDIR='${WRKSRC}' EXTRA_SAMPLES='${EXTRA_SAMPLES}' \
|
||||
SYS_CXX='${CXX}' SYS_CXXFLAGS='${CXXFLAGS}'
|
||||
MAKE_ENV= QTDIR="${WRKSRC}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \
|
||||
SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}" \
|
||||
LD_LIBRARY_PATH="${WRKSRC}/lib"
|
||||
CONFIGURE_STYLE= simple
|
||||
CONFIGURE_ARGS= -gif -system-libpng -system-jpeg -system-zlib -no-thread -sm
|
||||
CONFIGURE_ENV= QTDIR="${WRKSRC}" MODULES="${MODULES}"
|
||||
@ -28,7 +30,7 @@ CONFIGURE_ENV= QTDIR="${WRKSRC}" MODULES="${MODULES}"
|
||||
MULTI_PACKAGES= -examples -html
|
||||
SUBPACKAGE?=
|
||||
|
||||
FLAVORS=GL
|
||||
FLAVORS= gl
|
||||
FLAVOR?=
|
||||
|
||||
MODULES= tools kernel widgets dialogs \
|
||||
@ -37,7 +39,7 @@ EXTRA_SAMPLES=
|
||||
.if ${SUBPACKAGE} != "-html"
|
||||
LIB_DEPENDS= png.1.::graphics/png \
|
||||
jpeg.62.::graphics/jpeg
|
||||
. if ${FLAVOR:U} == "GL"
|
||||
. if ${FLAVOR:L} == "gl"
|
||||
LIB_DEPENDS+= GL.3.2::graphics/Mesa
|
||||
MODULES+= opengl
|
||||
EXTRA_SAMPLES+=box gear glpixmap overlay overlay_x11 sharedbox
|
||||
@ -55,7 +57,8 @@ QT_DOC= ${PREFIX}/share/doc/qt2
|
||||
# for manpages in MESSAGE
|
||||
SUBST_VARS= QT_LIBDIR QT_DOC
|
||||
|
||||
DOCS= ANNOUNCE FAQ LICENSE.GPL README README.QT changes-2.2.0
|
||||
DOCS= ANNOUNCE FAQ LICENSE.GPL README README.QT \
|
||||
changes-2.2.0 changes-2.2.1
|
||||
|
||||
post-patch:
|
||||
@cd ${WRKSRC}/configs; for i in openbsd-*; do \
|
||||
@ -88,9 +91,9 @@ do-install:
|
||||
@if [ -f ${WRKBUILD}/lib/libqt.a ]; then \
|
||||
${INSTALL_DATA} ${WRKBUILD}/lib/libqt.a ${PREFIX}/lib/qt2; \
|
||||
fi
|
||||
@if [ -f ${WRKBUILD}/lib/libqt.so.2.2.0 ]; then \
|
||||
${INSTALL_DATA} ${WRKBUILD}/lib/libqt.so.2.2.0 \
|
||||
${PREFIX}/lib/qt2/libqt.so.2.20; \
|
||||
@if [ -f ${WRKBUILD}/lib/libqt.so.2.2.1 ]; then \
|
||||
${INSTALL_DATA} ${WRKBUILD}/lib/libqt.so.2.2.1 \
|
||||
${PREFIX}/lib/qt2/libqt.so.2.21; \
|
||||
fi
|
||||
@if [ -f ${WRKBUILD}/lib/libqutil.a ]; then \
|
||||
${INSTALL_DATA} ${WRKBUILD}/lib/libqutil.a ${PREFIX}/lib/qt2; \
|
||||
@ -141,10 +144,10 @@ do-install:
|
||||
|
||||
.if ${SUBPACKAGE} == "-examples"
|
||||
. if ${FLAVOR:L} == "gl"
|
||||
PKGNAME:=qt2-examples-2.0-gl
|
||||
PKGNAME:= qt2-examples-${VERSION}-gl
|
||||
. else
|
||||
PKGNAME:=qt2-examples-2.0
|
||||
PKGNAME:= qt2-examples-${VERSION}
|
||||
. endif
|
||||
.elif ${SUBPACKAGE} == "-html"
|
||||
PKGNAME:=qt2-html-2.0
|
||||
PKGNAME:= qt2-html-${VERSION}
|
||||
.endif
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (qt-x11-2.2.0.tar.gz) = dd0a736e44a6a2229ade3822e94b86ef
|
||||
RMD160 (qt-x11-2.2.0.tar.gz) = 7639c8ac2cdf23b2dff97e45b9c1cf6f12d3d604
|
||||
SHA1 (qt-x11-2.2.0.tar.gz) = ff3b7aa2ccef6bb987927ccfaa48f941f4662f2b
|
||||
MD5 (qt-x11-2.2.1.tar.gz) = 7586b519746937c4e32a6db644c80279
|
||||
RMD160 (qt-x11-2.2.1.tar.gz) = e8b6d0e0cfe3ec52e56f3968040c9c65e48bd968
|
||||
SHA1 (qt-x11-2.2.1.tar.gz) = c160edce192c8755e703ba19747da317701bb323
|
||||
|
@ -1,7 +1,8 @@
|
||||
--- configs/openbsd-g++-shared.orig Fri Sep 22 03:35:36 2000
|
||||
+++ configs/openbsd-g++-shared Fri Sep 22 04:05:43 2000
|
||||
@@ -1,11 +1,11 @@
|
||||
--- configs/openbsd-g++-shared.orig Wed Oct 4 05:55:24 2000
|
||||
+++ configs/openbsd-g++-shared Sat Oct 7 14:09:37 2000
|
||||
@@ -1,12 +1,12 @@
|
||||
# Compiling
|
||||
INTERFACE_DECL_PATH = .
|
||||
-SYSCONF_CXX = g++
|
||||
+SYSCONF_CXX = $(SYS_CXX)
|
||||
SYSCONF_CC = gcc
|
||||
@ -15,7 +16,7 @@
|
||||
|
||||
# Compiling YACC output
|
||||
SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
|
||||
@@ -17,46 +17,46 @@ SYSCONF_RPATH_OPENGL =
|
||||
@@ -18,30 +18,30 @@
|
||||
|
||||
# Linking with support libraries
|
||||
# X11
|
||||
@ -36,12 +37,14 @@
|
||||
# Linking applications
|
||||
-SYSCONF_LINK = g++
|
||||
-SYSCONF_LFLAGS =
|
||||
-SYSCONF_LIBS =
|
||||
+SYSCONF_LINK = $(SYS_CXX)
|
||||
+SYSCONF_LFLAGS = -L/usr/X11R6/lib -L/usr/local/lib
|
||||
SYSCONF_LIBS =
|
||||
+SYSCONF_LIBS = -lz
|
||||
|
||||
# Link flags for shared objects
|
||||
SYSCONF_LFLAGS_SHOBJ = -Bshareable
|
||||
-SYSCONF_LFLAGS_SHOBJ = -Bshareable
|
||||
+SYSCONF_LFLAGS_SHOBJ = -shared
|
||||
|
||||
# Flags for threading
|
||||
-SYSCONF_CFLAGS_THREAD =
|
||||
@ -53,14 +56,7 @@
|
||||
# SYSCONF_LIBS_THREAD = ???
|
||||
|
||||
# Meta-object compiler
|
||||
SYSCONF_MOC = $(QTDIR)/bin/moc
|
||||
|
||||
# UI compiler
|
||||
-SYSCONF_UIC = $(QTDIR)/bin/uic
|
||||
+SYSCONF_UIC = env LD_LIBRARY_PATH="$(QTDIR)/lib" $(QTDIR)/bin/uic
|
||||
|
||||
# Linking shared libraries
|
||||
# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.0.1
|
||||
@@ -55,9 +55,9 @@
|
||||
# - Place target in $(DESTDIR) - which has a trailing /
|
||||
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
|
||||
#
|
||||
@ -72,7 +68,7 @@
|
||||
|
||||
# Linking static libraries
|
||||
# - Build the $(TARGET) library, eg. lib$(TARGET).a
|
||||
@@ -68,7 +68,7 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDI
|
||||
@@ -69,7 +69,7 @@
|
||||
$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
|
||||
ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
|
||||
# Compiling application source
|
||||
|
@ -1,7 +1,8 @@
|
||||
--- configs/openbsd-g++-shared-debug.orig Fri Sep 22 03:35:35 2000
|
||||
+++ configs/openbsd-g++-shared-debug Fri Sep 22 04:05:46 2000
|
||||
@@ -1,11 +1,11 @@
|
||||
--- configs/openbsd-g++-shared-debug.orig Wed Oct 4 05:55:24 2000
|
||||
+++ configs/openbsd-g++-shared-debug Sat Oct 7 14:09:52 2000
|
||||
@@ -1,12 +1,12 @@
|
||||
# Compiling
|
||||
INTERFACE_DECL_PATH = .
|
||||
-SYSCONF_CXX = g++
|
||||
+SYSCONF_CXX = $(SYS_CXX)
|
||||
SYSCONF_CC = gcc
|
||||
@ -15,7 +16,7 @@
|
||||
|
||||
# Compiling YACC output
|
||||
SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
|
||||
@@ -17,46 +17,46 @@ SYSCONF_RPATH_OPENGL =
|
||||
@@ -18,30 +18,30 @@
|
||||
|
||||
# Linking with support libraries
|
||||
# X11
|
||||
@ -36,12 +37,14 @@
|
||||
# Linking applications
|
||||
-SYSCONF_LINK = g++
|
||||
-SYSCONF_LFLAGS =
|
||||
-SYSCONF_LIBS =
|
||||
+SYSCONF_LINK = $(SYS_CXX)
|
||||
+SYSCONF_LFLAGS = -L/usr/X11R6/lib -L/usr/local/lib
|
||||
SYSCONF_LIBS =
|
||||
+SYSCONF_LIBS = -lz
|
||||
|
||||
# Link flags for shared objects
|
||||
SYSCONF_LFLAGS_SHOBJ = -Bshareable
|
||||
-SYSCONF_LFLAGS_SHOBJ = -Bshareable
|
||||
+SYSCONF_LFLAGS_SHOBJ = -shared
|
||||
|
||||
# Flags for threading
|
||||
-SYSCONF_CFLAGS_THREAD =
|
||||
@ -53,14 +56,7 @@
|
||||
# SYSCONF_LIBS_THREAD = ???
|
||||
|
||||
# Meta-object compiler
|
||||
SYSCONF_MOC = $(QTDIR)/bin/moc
|
||||
|
||||
# UI compiler
|
||||
-SYSCONF_UIC = $(QTDIR)/bin/uic
|
||||
+SYSCONF_UIC = env LD_LIBRARY_PATH="$(QTDIR)/lib" $(QTDIR)/bin/uic
|
||||
|
||||
# Linking shared libraries
|
||||
# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.0.1
|
||||
@@ -55,9 +55,9 @@
|
||||
# - Place target in $(DESTDIR) - which has a trailing /
|
||||
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
|
||||
#
|
||||
|
@ -1,18 +0,0 @@
|
||||
--- examples/box/Makefile.in.orig Fri Sep 22 20:47:05 2000
|
||||
+++ examples/box/Makefile.in Fri Sep 22 20:50:27 2000
|
||||
@@ -3,12 +3,12 @@
|
||||
####### Compiler, tools and options
|
||||
|
||||
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
|
||||
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
|
||||
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_OPENGL)
|
||||
CC = $(SYSCONF_CC) $(QT_C_MT)
|
||||
CFLAGS = $(SYSCONF_CFLAGS)
|
||||
INCPATH =
|
||||
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
|
||||
-LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS)
|
||||
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_LFLAGS_OPENGL)
|
||||
+LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_OPENGL)
|
||||
MOC = $(SYSCONF_MOC)
|
||||
UIC = $(SYSCONF_UIC)
|
||||
|
@ -1,18 +0,0 @@
|
||||
--- examples/gear/Makefile.in.orig Fri Sep 22 20:56:49 2000
|
||||
+++ examples/gear/Makefile.in Fri Sep 22 20:57:23 2000
|
||||
@@ -3,12 +3,12 @@
|
||||
####### Compiler, tools and options
|
||||
|
||||
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
|
||||
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
|
||||
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_OPENGL)
|
||||
CC = $(SYSCONF_CC) $(QT_C_MT)
|
||||
CFLAGS = $(SYSCONF_CFLAGS)
|
||||
INCPATH =
|
||||
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
|
||||
-LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS)
|
||||
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_LFLAGS_OPENGL)
|
||||
+LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_OPENGL)
|
||||
MOC = $(SYSCONF_MOC)
|
||||
UIC = $(SYSCONF_UIC)
|
||||
|
@ -1,18 +0,0 @@
|
||||
--- examples/glpixmap/Makefile.in.orig Fri Sep 22 21:41:54 2000
|
||||
+++ examples/glpixmap/Makefile.in Fri Sep 22 21:42:14 2000
|
||||
@@ -3,12 +3,12 @@
|
||||
####### Compiler, tools and options
|
||||
|
||||
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
|
||||
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
|
||||
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_OPENGL)
|
||||
CC = $(SYSCONF_CC) $(QT_C_MT)
|
||||
CFLAGS = $(SYSCONF_CFLAGS)
|
||||
INCPATH =
|
||||
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
|
||||
-LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS)
|
||||
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_LFLAGS_OPENGL)
|
||||
+LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_OPENGL)
|
||||
MOC = $(SYSCONF_MOC)
|
||||
UIC = $(SYSCONF_UIC)
|
||||
|
@ -1,18 +0,0 @@
|
||||
--- examples/overlay/Makefile.in.orig Fri Sep 22 21:04:14 2000
|
||||
+++ examples/overlay/Makefile.in Fri Sep 22 21:04:40 2000
|
||||
@@ -3,12 +3,12 @@
|
||||
####### Compiler, tools and options
|
||||
|
||||
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
|
||||
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
|
||||
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_OPENGL)
|
||||
CC = $(SYSCONF_CC) $(QT_C_MT)
|
||||
CFLAGS = $(SYSCONF_CFLAGS)
|
||||
INCPATH =
|
||||
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
|
||||
-LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS)
|
||||
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_LFLAGS_OPENGL)
|
||||
+LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_OPENGL)
|
||||
MOC = $(SYSCONF_MOC)
|
||||
UIC = $(SYSCONF_UIC)
|
||||
|
@ -1,18 +0,0 @@
|
||||
--- examples/overlay_x11/Makefile.in.orig Fri Sep 22 21:07:18 2000
|
||||
+++ examples/overlay_x11/Makefile.in Fri Sep 22 21:38:27 2000
|
||||
@@ -3,12 +3,12 @@
|
||||
####### Compiler, tools and options
|
||||
|
||||
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
|
||||
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
|
||||
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS_OPENGL)
|
||||
CC = $(SYSCONF_CC) $(QT_C_MT)
|
||||
CFLAGS = $(SYSCONF_CFLAGS)
|
||||
INCPATH =
|
||||
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
|
||||
-LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS)
|
||||
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_LFLAGS_X11) $(SYSCONF_LFLAGS_OPENGL)
|
||||
+LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_X11) $(SYSCONF_LIBS_OPENGL)
|
||||
MOC = $(SYSCONF_MOC)
|
||||
UIC = $(SYSCONF_UIC)
|
||||
|
@ -1,18 +0,0 @@
|
||||
--- examples/sharedbox/Makefile.in.orig Fri Sep 22 21:45:55 2000
|
||||
+++ examples/sharedbox/Makefile.in Fri Sep 22 21:46:21 2000
|
||||
@@ -3,12 +3,12 @@
|
||||
####### Compiler, tools and options
|
||||
|
||||
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
|
||||
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
|
||||
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_OPENGL)
|
||||
CC = $(SYSCONF_CC) $(QT_C_MT)
|
||||
CFLAGS = $(SYSCONF_CFLAGS)
|
||||
INCPATH =
|
||||
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
|
||||
-LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS)
|
||||
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_LFLAGS_OPENGL)
|
||||
+LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_OPENGL)
|
||||
MOC = $(SYSCONF_MOC)
|
||||
UIC = $(SYSCONF_UIC)
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- tools/designer/designer/Makefile.in.orig Sun Sep 3 19:41:21 2000
|
||||
+++ tools/designer/designer/Makefile.in Fri Sep 22 03:35:34 2000
|
||||
@@ -8,7 +8,7 @@ CC = $(SYSCONF_CC) $(QT_C_MT)
|
||||
CFLAGS = $(SYSCONF_CFLAGS) -DDESIGNER
|
||||
INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib
|
||||
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
|
||||
-LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) -lqutil -L$(QTDIR)/lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS)
|
||||
+LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) -lqutil -L$(QTDIR)/lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) -lz
|
||||
MOC = $(SYSCONF_MOC)
|
||||
UIC = $(SYSCONF_UIC)
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- tools/designer/uic/Makefile.in.orig Sun Sep 3 19:41:22 2000
|
||||
+++ tools/designer/uic/Makefile.in Fri Sep 22 03:35:34 2000
|
||||
@@ -8,7 +8,7 @@ CC = $(SYSCONF_CC) $(QT_C_MT)
|
||||
CFLAGS = $(SYSCONF_CFLAGS) -DUIC
|
||||
INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib
|
||||
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
|
||||
-LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) -lqutil -L../lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS)
|
||||
+LIBS = $(SUBLIBS) $(SYSCONF_LIBS_QTAPP) -lqutil -L../lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) -lz
|
||||
MOC = $(SYSCONF_MOC)
|
||||
UIC = $(SYSCONF_UIC)
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.5 2000/09/22 15:02:36 espie Exp $
|
||||
lib/qt2/libqt.so.2.20
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.6 2000/10/08 06:02:04 brad Exp $
|
||||
lib/qt2/libqt.so.2.21
|
||||
lib/qt2/libqutil.so.1.0
|
||||
NEWDYNLIBDIR(%B)
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2000/09/22 20:50:20 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.6 2000/10/08 06:02:04 brad Exp $
|
||||
bin/designer
|
||||
bin/findtr
|
||||
bin/moc2
|
||||
@ -285,6 +285,7 @@ include/X11/qt2/qxt.h
|
||||
%%SHARED%%
|
||||
lib/qt2/bin/moc
|
||||
lib/qt2/bin/designer
|
||||
lib/qt2/man/man3/PCOPChannel.3
|
||||
lib/qt2/man/man3/QAccel.3
|
||||
lib/qt2/man/man3/QAction.3
|
||||
lib/qt2/man/man3/QActionGroup.3
|
||||
@ -614,6 +615,7 @@ lib/qt2/man/man3/QXmlSimpleReader.3
|
||||
lib/qt2/man/man3/QXtApplication.3
|
||||
lib/qt2/man/man3/QXtWidget.3
|
||||
lib/qt2/man/man3/Qt.3
|
||||
lib/qt2/man/man3/pcopchannel.3
|
||||
lib/qt2/man/man3/qaccel.3
|
||||
lib/qt2/man/man3/qaction.3
|
||||
lib/qt2/man/man3/qactiongroup.3
|
||||
@ -953,6 +955,7 @@ share/doc/qt2/LICENSE.GPL
|
||||
share/doc/qt2/README
|
||||
share/doc/qt2/README.QT
|
||||
share/doc/qt2/changes-2.2.0
|
||||
share/doc/qt2/changes-2.2.1
|
||||
@unexec echo "Please remove %D/lib/qt2/man from /etc/man.conf manually if needed"
|
||||
@dirrm include/X11/qt2
|
||||
@dirrm lib/qt2/tools/designer/templates
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-html,v 1.2 2000/09/22 15:02:37 espie Exp $
|
||||
@comment $OpenBSD: PLIST-html,v 1.3 2000/10/08 06:02:05 brad Exp $
|
||||
share/doc/qt2/html/HOWTO-framebuffer.html
|
||||
share/doc/qt2/html/aboutqt.html
|
||||
share/doc/qt2/html/abstractwidgets.html
|
||||
@ -281,6 +281,8 @@ share/doc/qt2/html/objecttrees.html
|
||||
share/doc/qt2/html/opengl.html
|
||||
share/doc/qt2/html/organizers.html
|
||||
share/doc/qt2/html/palette.png
|
||||
share/doc/qt2/html/pcopchannel-members.html
|
||||
share/doc/qt2/html/pcopchannel.html
|
||||
share/doc/qt2/html/picture-picture-cpp.html
|
||||
share/doc/qt2/html/pictures.html
|
||||
share/doc/qt2/html/pnglogo.png
|
||||
@ -1223,6 +1225,7 @@ share/doc/qt2/html/qworkspace-members.html
|
||||
share/doc/qt2/html/qworkspace.html
|
||||
share/doc/qt2/html/qwsdecoration-members.html
|
||||
share/doc/qt2/html/qwsdecoration.html
|
||||
share/doc/qt2/html/qwsdisplay_qws-h.html
|
||||
share/doc/qt2/html/qwsmanager_qws-h.html
|
||||
share/doc/qt2/html/qxml-h.html
|
||||
share/doc/qt2/html/qxmlattributes-members.html
|
||||
|
Loading…
Reference in New Issue
Block a user