a few tweaks:

- since we no longer compile qt3 without mt, link the files with the `usual' names (compat settings and fragment). - install supplementary development libraries, this will help for other ports (asked by Steve Shockley). - help qmake work off-the-shelf. - provide a no_examples pseudo-flavor. bump pkgname.
2004-10-26 22:59:24 +00:00 · 2004-10-26 22:59:24 +00:00 · efe32ee3d3
commit efe32ee3d3
parent ef6ee84872
6 changed files with 57 additions and 18 deletions
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2004/09/20 20:05:51 brad Exp $
+# $OpenBSD: Makefile,v 1.39 2004/10/26 22:59:24 espie Exp $
 # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $

 COMMENT=		"C++ X11 GUI toolkit"
@ -8,7 +8,7 @@ COMMENT-postgresql=	"PostgresSQL plugin for qt3"
 COMMENT-mysql=		"MySQL plugin for qt3"
 COMMENT-base=		"include and docs for qt3"

-PKGNAME=		qt3-${VERSION}p1
+PKGNAME=		qt3-${VERSION}p2
 PKGNAME-mysql=		qt3-mysql-${VERSION}
 PKGNAME-postgresql=	qt3-postgresql-${VERSION}
 PKGNAME-examples=	qt3-examples-${VERSION}
@ -26,8 +26,9 @@ MAINTAINER=	Marc Espie <espie@openbsd.org>

 FLAVORS=mt debug

-PSEUDO_FLAVORS=	no_mysql no_postgresql
+PSEUDO_FLAVORS=	no_mysql no_postgresql no_examples
 FLAVOR?=mt
+COMPAT=Yes

 # GPL/QPL
 PERMIT_PACKAGE_CDROM=	Yes
@ -35,6 +36,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

+PKG_ARGS=-Dcompat=1
+
 USE_X11=	Yes
 MAKE_ENV=	QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \
 		SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}" \
@ -67,13 +70,13 @@ PKGDEBUG=
 .endif

 .if ${FLAVOR:L:Mmt}
-FULLPKGNAME=		qt3-mt-${VERSION}p1${PKGDEBUG}
+FULLPKGNAME=		qt3-mt-${VERSION}p2${PKGDEBUG}
 CONFIGURE_ARGS+=-thread
 .else
 CONFIGURE_ARGS+=-no-thread
 .endif

-.if ${FLAVOR:L:Mmt} && !${FLAVOR:L:Mdebug}
+.if ${FLAVOR:L:Mmt} && !${FLAVOR:L:Mdebug} && !${FLAVOR:L:Mno_examples}
 MULTI_PACKAGES+=	-examples
 .else
 ALL_TARGET=sub-src sub-tools
@ -165,13 +168,13 @@ NO_REGRESS=	Yes
 PROGRAMS3=designer findtr moc qt20fix qtrename140 uic
 PROGRAMS=assistant linguist lrelease lupdate qm2ts qmake qtconfig 

-LIBRARIES=qt${MT_SUFX}.so.3.33 qui${MT_SUFX}.so.1.0
+LIBRARIES=qt${MT_SUFX}.so.3.33 qui${MT_SUFX}.so.1.0 \
+	editor.a designercore.a qassistantclient.a

 .if ${FLAVOR:L:Mmt}
 MT_SUFX=-mt
 .else
 MT_SUFX=
-LIBRARIES+=editor.so.1.0
 .endif

 .if ${FLAVOR:L:Mmt} && !${FLAVOR:L:Mdebug}
@ -271,5 +274,15 @@ do-install:
 	    ${QT_PLUGINSDIR}/designer
 	${INSTALL_DATA} ${WRKBUILD}/plugins/designer/librcplugin.so \
 	    ${QT_PLUGINSDIR}/designer
+.if ${COMPAT:L} == "yes" && ${FLAVOR:L:Mmt}
+.  for p in ${PROGRAMS}
+	cd ${PREFIX}/bin && ln -sf $p${MT_SUFFX} $p
+.  endfor
+.  for p in ${PROGRAMS3}
+	cd ${PREFIX}/bin && ln -sf $p3${MT_SUFFX} $p3
+.  endfor
+	cd ${PREFIX}/lib && ln -sf libqui${MT_SUFFX}.so.1.0 libqui.so.1.0
+	cd ${PREFIX}/lib/qt3 && ln -sf libqui${MT_SUFFX}.so.1.0 libqui.so.1.0
+.endif

 .include <bsd.port.mk>
--- a/x11/qt3/patches/patch-mkspecs_openbsd-g++_qmake_conf
+++ b/x11/qt3/patches/patch-mkspecs_openbsd-g++_qmake_conf
@ -1,6 +1,6 @@
-$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.15 2004/07/22 23:03:09 brad Exp $
--- mkspecs/openbsd-g++/qmake.conf.orig	2004-04-19 03:36:43.000000000 -0600
-+++ mkspecs/openbsd-g++/qmake.conf	2004-06-20 15:18:32.000000000 -0600
+$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.16 2004/10/26 22:59:24 espie Exp $
+--- mkspecs/openbsd-g++/qmake.conf.orig	Thu Aug  5 16:42:57 2004
+++ mkspecs/openbsd-g++/qmake.conf	Sun Sep 26 15:54:59 2004
@@ -8,6 +8,7 @@ MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release link_prl
@ -9,17 +9,23 @@ $OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.15 2004/07/22 23:03:09 brad E
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
-@@ -34,8 +35,8 @@ QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SH
+@@ -34,12 +35,12 @@ QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SH
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 -QMAKE_INCDIR		= /usr/local/include
 -QMAKE_LIBDIR		= /usr/local/lib
-+QMAKE_INCDIR		= $(QTDIR)/include
-+QMAKE_LIBDIR		= $(QTDIR)/lib
+QMAKE_INCDIR		= $(LOCALBASE)/include
+QMAKE_LIBDIR		= $(LOCALBASE)/lib
 QMAKE_INCDIR_X11	= /usr/X11R6/include
 QMAKE_LIBDIR_X11	= /usr/X11R6/lib
- QMAKE_INCDIR_QT		= $(QTDIR)/include
+-QMAKE_INCDIR_QT		= $(QTDIR)/include
+-QMAKE_LIBDIR_QT		= $(QTDIR)/lib
+QMAKE_INCDIR_QT		= $(LOCALBASE)/include/X11/qt3
+QMAKE_LIBDIR_QT		= $(LOCALBASE)/lib/qt3
+ QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+ 
@@ -53,7 +54,7 @@ QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
--- a/x11/qt3/pkg/PFRAG.compat
+++ b/x11/qt3/pkg/PFRAG.compat
@ -0,0 +1,16 @@
+@comment $OpenBSD: PFRAG.compat,v 1.1 2004/10/26 22:59:24 espie Exp $
+@conflict qt3
+bin/assistant
+bin/designer3
+bin/findtr3
+bin/linguist
+bin/lrelease
+bin/lupdate
+bin/moc3
+bin/qm2ts
+bin/qmake
+bin/qt20fix3
+bin/qtconfig
+bin/qtrename1403
+bin/uic3
+%%SHARED%%
--- a/x11/qt3/pkg/PFRAG.no-mt
+++ b/x11/qt3/pkg/PFRAG.no-mt
@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.no-mt,v 1.2 2004/06/14 04:06:37 brad Exp $
-lib/qt3/libeditor.a
--- a/x11/qt3/pkg/PFRAG.shared-compat
+++ b/x11/qt3/pkg/PFRAG.shared-compat
@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared-compat,v 1.1 2004/10/26 22:59:24 espie Exp $
+@lib lib/libqui.so.1.0
+@lib lib/qt3/libqui.so.1.0
--- a/x11/qt3/pkg/PLIST
+++ b/x11/qt3/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.17 2004/09/16 04:26:46 brad Exp $
+@comment $OpenBSD: PLIST,v 1.18 2004/10/26 22:59:24 espie Exp $
 bin/assistant${MT_SUFX}
 bin/designer3${MT_SUFX}
 bin/findtr3${MT_SUFX}
@ -30,5 +30,8 @@ lib/qt3/plugins${MT_SUFX}/
 lib/qt3/plugins${MT_SUFX}/designer/
 lib/qt3/plugins${MT_SUFX}/sqldrivers/
 lib/qt3/plugins${MT_SUFX}/styles/
-!%%mt%%
+lib/qt3/libdesignercore.a
+lib/qt3/libeditor.a
+lib/qt3/libqassistantclient.a
+%%compat%%
 %%SHARED%%