Fix qt2 for XFree4, provided Matthieu and Todd fix XFree4.

Note a build dependency on libjpeg.
2001-04-17 16:56:37 +00:00 · 2001-04-17 16:56:37 +00:00 · a5af56271a
commit a5af56271a
parent f7db65c8f4
6 changed files with 60 additions and 52 deletions
--- a/x11/Makefile
+++ b/x11/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.97 2001/04/10 20:16:45 lebel Exp $
+# $OpenBSD: Makefile,v 1.98 2001/04/17 16:56:37 espie Exp $
 # $FreeBSD: Makefile,v 1.178 1997/11/24 05:32:52 fenner Exp $
 #

@ -70,7 +70,7 @@
     SUBDIR += qlwm
     SUBDIR += qt
     SUBDIR += qt2
-     SUBDIR += qt2,gl
+     SUBDIR += qt2
     SUBDIR += qt2-designer
     SUBDIR += qvwm
     SUBDIR += qvwm,esound
--- a/x11/qt2/Makefile
+++ b/x11/qt2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2001/04/02 01:57:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.22 2001/04/17 16:56:37 espie Exp $
 # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
 COMMENT=		C++ X11 GUI toolkit
 COMMENT-examples=	examples and tutorial for qt2
@ -31,8 +31,9 @@ MAKE_FLAGS=	DESIGNER_SUBDIR=dummy
 CONFIGURE_STYLE= simple
 CONFIGURE_ARGS=	-gif -system-libmng -system-libpng -system-jpeg \
 		-system-zlib -no-thread -sm -no-g++-exceptions \
-		-kde
+		-kde -v
 #CONFIGURE_ARGS+=-static -debug
+#CONFIGURE_ARGS+=-debug

 # For XFree 4
 #CONFIGURE_ARGS+=-xft
@ -41,26 +42,22 @@ CONFIGURE_ENV=	QTDIR="${WRKSRC}" MODULES="${MODULES}" KDEDIR="${LOCALBASE}"
 MULTI_PACKAGES=	-examples -html
 SUBPACKAGE?=

-FLAVORS=	gl
-FLAVOR?=
-
 MODULES=	tools kernel widgets dialogs \
 		iconview workspace network canvas table xml
 EXTRA_SAMPLES=

+MODULES+= opengl
+EXTRA_SAMPLES+=box gear glpixmap overlay overlay_x11 sharedbox
+

 LIB_DEPENDS=

 .if ${SUBPACKAGE} != "-html"
 LIB_DEPENDS+=	png.1.::graphics/png \
 		mng.1.::graphics/libmng
-.  if ${FLAVOR:L} == "gl"
-LIB_DEPENDS+= 	GL.3.2::graphics/Mesa
-MODULES+= opengl
-EXTRA_SAMPLES+=box gear glpixmap overlay overlay_x11 sharedbox
-.else
-CONFIGURE_ARGS+=-no-opengl
-.  endif
+.endif
+.if ${SUBPACKAGE} == "-examples"
+LIB_DEPENDS+=	qt.2.::x11/qt2
 .endif

 QT_INCDIR=	${PREFIX}/include/X11/qt2
@ -86,7 +83,9 @@ post-patch:

 post-configure:
 	@cd ${WRKSRC} && cp -R examples examples-src
+	@find ${WRKSRC}/examples-src -name '*.orig' |xargs rm
 	@cd ${WRKSRC} && cp -R tutorial tutorial-src
+	@find ${WRKSRC}/tutorial-src -name '*.orig' |xargs rm

 pre-build:
 	@echo ""
@ -143,7 +142,6 @@ do-install:
 	cp -R ${WRKSRC}/doc/html/* ${QT_DOC}/html

 PKGNAME=		qt2-${VERSION}
-PKGNAME-examples-gl=	qt2-examples-${VERSION}-gl
 PKGNAME-examples=	qt2-examples-${VERSION}
 PKGNAME-html=		qt2-html-${VERSION}

--- a/x11/qt2/patches/patch-configs_openbsd-g++-shared
+++ b/x11/qt2/patches/patch-configs_openbsd-g++-shared
@ -1,23 +1,21 @@
--- configs/openbsd-g++-shared.orig	Wed Nov  8 18:06:37 2000
-+++ configs/openbsd-g++-shared	Tue Nov 21 10:32:18 2000
-@@ -1,13 +1,13 @@
+--- configs/openbsd-g++-shared.orig	Tue Apr 17 15:28:49 2001
+++ configs/openbsd-g++-shared	Tue Apr 17 16:01:44 2001
+@@ -1,11 +1,11 @@
 # Compiling
 INTERFACE_DECL_PATH 	= .
 -SYSCONF_CXX		= g++
+-SYSCONF_CC		= gcc
 +SYSCONF_CXX		= $(SYS_CXX)
- SYSCONF_CC		= gcc
+SYSCONF_CC		= $(SYS_CC)
 DASHCROSS		= 
 
 # Compiling with support libraries
 -SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
 +SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include -I/usr/local/include
 SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL	= -I/usr/local/include -I/usr/X11R6/include
+ SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
 
- # Compiling YACC output
- SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
-@@ -19,30 +19,30 @@ SYSCONF_RPATH_OPENGL	= 
+@@ -19,31 +19,31 @@ SYSCONF_RPATH_OPENGL	= 
 
 # Linking with support libraries
 # X11
@ -30,7 +28,7 @@
 SYSCONF_LIBS_QT_OPENGL	= 
 # OpenGL
 -SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL	= -L$(QTDIR)/lib -L/usr/local/lib -L/usr/X11R6/lib
+SYSCONF_LFLAGS_OPENGL	= -pthread -L/usr/X11R6/lib
 SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
 # Yacc
 SYSCONF_LIBS_YACC	= 
@ -51,31 +49,35 @@
 -SYSCONF_CFLAGS_THREAD	= 
 -SYSCONF_CXXFLAGS_THREAD	= 
 -SYSCONF_LFLAGS_THREAD	= 
+-# SYSCONF_LIBS_THREAD	= ???
 +SYSCONF_CFLAGS_THREAD	= -pthread
 +SYSCONF_CXXFLAGS_THREAD	= -pthread
 +SYSCONF_LFLAGS_THREAD	= -pthread
- # SYSCONF_LIBS_THREAD	= ???
+SYSCONF_LIBS_THREAD	= -pthread
 
 # Meta-object compiler
+ SYSCONF_MOC		= $(QTDIR)/bin/moc
@@ -56,9 +56,9 @@ SYSCONF_UIC		= $(QTDIR)/bin/uic
 #   - Place target in $(DESTDIR) - which has a trailing /
 #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
 #
 -SYSCONF_LINK_SHLIB	= ld
-+SYSCONF_LINK_SHLIB	= $(SYS_CXX) -shared -fPIC
 -SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
 -SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS)
+SYSCONF_LINK_SHLIB	= $(SYS_CXX) -shared -fPIC
 +SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).`expr $(VER_MIN) \* 10 + $(VER_PATCH)`
 +SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 # Linking static libraries
 #   - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -70,7 +70,7 @@ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDI
+@@ -70,8 +70,8 @@ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDI
 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
 				 ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
 # Compiling application source
 -SYSCONF_CXXFLAGS	= -O2
+-SYSCONF_CFLAGS		= -O2
 +SYSCONF_CXXFLAGS	= $(SYS_CXXFLAGS)
- SYSCONF_CFLAGS		= -O2
+SYSCONF_CFLAGS		= $(SYS_CFLAGS)
 # Default link type (static linking is still be used where required)
 SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
--- a/x11/qt2/patches/patch-configs_openbsd-g++-shared-debug
+++ b/x11/qt2/patches/patch-configs_openbsd-g++-shared-debug
@ -1,23 +1,21 @@
--- configs/openbsd-g++-shared-debug.orig	Wed Nov  8 18:06:37 2000
-+++ configs/openbsd-g++-shared-debug	Tue Nov 21 10:32:59 2000
-@@ -1,13 +1,13 @@
+--- configs/openbsd-g++-shared-debug.orig	Tue Apr 17 15:28:49 2001
+++ configs/openbsd-g++-shared-debug	Tue Apr 17 16:02:15 2001
+@@ -1,11 +1,11 @@
 # Compiling
 INTERFACE_DECL_PATH 	= .
 -SYSCONF_CXX		= g++
+-SYSCONF_CC		= gcc
 +SYSCONF_CXX		= $(SYS_CXX)
- SYSCONF_CC		= gcc
+SYSCONF_CC		= $(SYS_CC)
 DASHCROSS		= 
 
 # Compiling with support libraries
 -SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
 +SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include -I/usr/local/include
 SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL	= -I/usr/local/include -I/usr/X11R6/include
+ SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
 
- # Compiling YACC output
- SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
-@@ -19,30 +19,30 @@ SYSCONF_RPATH_OPENGL	= 
+@@ -19,31 +19,31 @@ SYSCONF_RPATH_OPENGL	= 
 
 # Linking with support libraries
 # X11
@ -30,7 +28,7 @@
 SYSCONF_LIBS_QT_OPENGL	= 
 # OpenGL
 -SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL	= -L$(QTDIR)/lib -L/usr/local/lib -L/usr/X11R6/lib
+SYSCONF_LFLAGS_OPENGL	= -pthread -L/usr/X11R6/lib
 SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
 # Yacc
 SYSCONF_LIBS_YACC	= 
@ -51,22 +49,35 @@
 -SYSCONF_CFLAGS_THREAD	= 
 -SYSCONF_CXXFLAGS_THREAD	= 
 -SYSCONF_LFLAGS_THREAD	= 
+-# SYSCONF_LIBS_THREAD	= ???
 +SYSCONF_CFLAGS_THREAD	= -pthread
 +SYSCONF_CXXFLAGS_THREAD	= -pthread
 +SYSCONF_LFLAGS_THREAD	= -pthread
- # SYSCONF_LIBS_THREAD	= ???
+SYSCONF_LIBS_THREAD	= -pthread
 
 # Meta-object compiler
+ SYSCONF_MOC		= $(QTDIR)/bin/moc
@@ -56,9 +56,9 @@ SYSCONF_UIC		= $(QTDIR)/bin/uic
 #   - Place target in $(DESTDIR) - which has a trailing /
 #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
 #
 -SYSCONF_LINK_SHLIB	= ld
-+SYSCONF_LINK_SHLIB	= $(SYS_CXX) -shared -fPIC
 -SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
 -SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS)
+SYSCONF_LINK_SHLIB	= $(SYS_CXX) -shared -fPIC
 +SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).`expr $(VER_MIN) \* 10 + $(VER_PATCH)`
 +SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 # Linking static libraries
 #   - Build the $(TARGET) library, eg. lib$(TARGET).a
+@@ -70,8 +70,8 @@ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDI
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
+ 				 ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -g
+-SYSCONF_CFLAGS		= -g
+SYSCONF_CXXFLAGS	= $(SYS_CXXFLAGS) -O0 -g
+SYSCONF_CFLAGS		= $(SYS_CFLAGS) -O0 -g
+ # Default link type (static linking is still be used where required)
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
--- a/x11/qt2/pkg/PFRAG.gl
+++ b/x11/qt2/pkg/PFRAG.gl
@ -1,8 +0,0 @@
-@comment $OpenBSD: PFRAG.gl,v 1.2 2000/11/24 14:22:21 espie Exp $
-lib/qt2/examples/box/box
-lib/qt2/examples/gear/gear
-lib/qt2/examples/glpixmap/glpixmap
-lib/qt2/examples/overlay/overlay
-lib/qt2/examples/overlay_x11/overlayrubber
-lib/qt2/examples/sharedbox/sharedbox
-lib/qt2/examples/texture/texture
--- a/x11/qt2/pkg/PLIST-examples
+++ b/x11/qt2/pkg/PLIST-examples
@ -1,6 +1,11 @@
-@comment $OpenBSD: PLIST-examples,v 1.5 2000/11/24 14:22:21 espie Exp $
-@pkgdep qt2-${VERSION}${FLAVORS}
-%%gl%%
+@comment $OpenBSD: PLIST-examples,v 1.6 2001/04/17 16:56:38 espie Exp $
+lib/qt2/examples/box/box
+lib/qt2/examples/gear/gear
+lib/qt2/examples/glpixmap/glpixmap
+lib/qt2/examples/overlay/overlay
+lib/qt2/examples/overlay_x11/overlayrubber
+lib/qt2/examples/sharedbox/sharedbox
+lib/qt2/examples/texture/texture
 lib/qt2/examples/Makefile
 lib/qt2/examples/Makefile.in
 lib/qt2/examples/README