switch to new MULTI_PACKAGES

This commit is contained in:
espie 2006-11-21 11:54:02 +00:00
parent a80a499591
commit 6de7840b1f
8 changed files with 18 additions and 21 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.72 2006/09/18 10:21:49 espie Exp $ # $OpenBSD: Makefile,v 1.73 2006/11/21 11:54:02 espie Exp $
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
COMMENT= "C++ X11 GUI toolkit" COMMENT-main= "C++ X11 GUI toolkit"
COMMENT-examples="examples and tutorial for qt" COMMENT-examples="examples and tutorial for qt"
COMMENT-html= "off-line html documentation for qt" COMMENT-html= "off-line html documentation for qt"
@ -9,7 +9,7 @@ VERSION= 1.45
DISTNAME= qt-${VERSION} DISTNAME= qt-${VERSION}
PKGNAME-examples=qt-examples-${VERSION} PKGNAME-examples=qt-examples-${VERSION}
PKGNAME-html= qt-html-${VERSION} PKGNAME-html= qt-html-${VERSION}
PKGNAME= qt-${VERSION}p1 PKGNAME-main= qt-${VERSION}p2
CATEGORIES= x11 CATEGORIES= x11
MASTER_SITES= ftp://ftp.troll.no/qt/source/ MASTER_SITES= ftp://ftp.troll.no/qt/source/
SHARED_LIBS= qt 10.0 \ SHARED_LIBS= qt 10.0 \
@ -25,7 +25,6 @@ PERMIT_PACKAGE_CDROM= "Restrictive license"
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= "Restrictive license" PERMIT_DISTFILES_CDROM= "Restrictive license"
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext c m stdc++
MAKE_FLAGS= QT_VER_MAJ=${LIBqt_VERSION:R} QT_VER_MIN=${LIBqt_VERSION:E} \ MAKE_FLAGS= QT_VER_MAJ=${LIBqt_VERSION:R} QT_VER_MIN=${LIBqt_VERSION:E} \
QIMGIO_VER_MAJ=${LIBqimgio_VERSION:R} QIMGIO_VER_MIN=${LIBqimgio_VERSION:E} QIMGIO_VER_MAJ=${LIBqimgio_VERSION:R} QIMGIO_VER_MIN=${LIBqimgio_VERSION:E}
@ -34,17 +33,13 @@ USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
MAKE_ENV= QTDIR="${WRKSRC}" SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}" MAKE_ENV= QTDIR="${WRKSRC}" SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}"
MULTI_PACKAGES= -examples -html MULTI_PACKAGES= -main -examples -html
SUBPACKAGE?=
.if defined(PACKAGING)
. if ${SUBPACKAGE} == "-examples" WANTLIB= X11 Xext c m stdc++
LIB_DEPENDS+= lib/qt/qt.>=1::x11/qt LIB_DEPENDS-examples= lib/qt/qt.>=1::x11/qt
. elif ${SUBPACKAGE} == "-html" PKG_ARCH-html= *
PKG_ARCH= * WANTLIB-html=
WANTLIB=
. endif
.endif
NO_REGRESS= Yes NO_REGRESS= Yes

View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PFRAG.no-shared,v 1.3 2001/06/09 19:53:24 espie Exp $
lib/qt/libqt.a
lib/libqimgio.a

View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.no-shared-main,v 1.1 2006/11/21 11:54:02 espie Exp $
lib/qt/libqt.a
lib/libqimgio.a

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/29 13:09:10 espie Exp $ @comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 11:54:02 espie Exp $
@lib lib/libqimgio.so.${LIBqimgio_VERSION} @lib lib/libqimgio.so.${LIBqimgio_VERSION}
@lib lib/libqt.so.${LIBqt_VERSION} @lib lib/libqt.so.${LIBqt_VERSION}
@lib lib/qt/libqt.so.${LIBqt_VERSION} @lib lib/qt/libqt.so.${LIBqt_VERSION}

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.20 2005/03/06 14:17:45 espie Exp $ @comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 11:54:02 espie Exp $
@pkgpath x11/qt
bin/moc bin/moc
include/X11/qt/ include/X11/qt/
include/X11/qt/jri.h include/X11/qt/jri.h

View File

@ -1,8 +1,9 @@
# $OpenBSD: qt.port.mk,v 1.2 2006/08/01 22:55:53 espie Exp $ # $OpenBSD: qt.port.mk,v 1.3 2006/11/21 11:54:02 espie Exp $
# This fragment uses MODQT_* variables to make it easier to substitute # This fragment uses MODQT_* variables to make it easier to substitute
# qt1/qt2/qt3 in a port. # qt1/qt2/qt3 in a port.
LIB_DEPENDS+=lib/qt/qt.>=1::x11/qt MODQT_LIB_DEPENDS=lib/qt/qt.>=1::x11/qt
LIB_DEPENDS+=${MODQT_LIB_DEPENDS}
MODQT_LIBDIR= ${LOCALBASE}/lib/qt MODQT_LIBDIR= ${LOCALBASE}/lib/qt
MODQT_INCDIR= ${LOCALBASE}/include/X11/qt MODQT_INCDIR= ${LOCALBASE}/include/X11/qt