new MULTI_PACKAGES

This commit is contained in:
espie 2006-11-26 00:22:16 +00:00
parent 9dd5b677c5
commit 65ba8cf57c
8 changed files with 20 additions and 27 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.14 2006/10/28 11:19:21 espie Exp $
# $OpenBSD: Makefile,v 1.15 2006/11/26 00:22:16 espie Exp $
COMMENT= "GNOME Structured File library"
COMMENT-main= "GNOME Structured File library"
COMMENT-gnome= "GNOME specific extensions to libgsf"
VERSION= 1.11.1
DISTNAME= libgsf-${VERSION}
PKGNAME= ${DISTNAME}p2
PKGNAME-gnome= libgsf-gnome-${VERSION}p2
PKGNAME-main= ${DISTNAME}p3
PKGNAME-gnome= libgsf-gnome-${VERSION}p3
SHARED_LIBS += gsf-1 12.1 # .12.1
SHARED_LIBS += gsf-gnome-1 12.1 # .12.1
@ -46,25 +46,17 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PSEUDO_FLAVORS= no_gnome
FLAVOR?=
MULTI_PACKAGES=
MULTI_PACKAGES= -main
.if !${FLAVOR:L:Mno_gnome}
MULTI_PACKAGES+= -gnome
.endif
SUBPACKAGE?=
.if defined(PACKAGING)
. if ${SUBPACKAGE} == "-gnome"
LIB_DEPENDS= gnomevfs-2::x11/gnome/vfs2 \
gsf-1::devel/libgsf
WANTLIB+= crypto popt ssl bz2 ORBitCosNaming-2 \
LIB_DEPENDS-gnome=${LIB_DEPENDS} \
gnomevfs-2::x11/gnome/vfs2 \
gsf-1::${BUILD_PKGPATH}
WANTLIB-gnome= crypto popt ssl ORBitCosNaming-2 \
ORBit-2 bonobo-2 bonobo-activation gmodule-2.0 \
gthread-2.0 gconf-2 glib-2.0 gobject-2.0 xml2
. endif
.else
. if ${MULTI_PACKAGES:M-gnome}
LIB_DEPENDS+= gnomevfs-2::x11/gnome/vfs2
. endif
.endif
gthread-2.0 gconf-2 m z
.if ${MULTI_PACKAGES:M-gnome}
CONFIGURE_ARGS+= --with-gnome

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.6 2006/01/03 18:07:28 bernd Exp $
@lib lib/libgsf-1.so.${LIBgsf-1_VERSION}

View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/26 00:22:16 espie Exp $
@lib lib/libgsf-1.so.${LIBgsf-1_VERSION}

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.7 2005/09/16 09:51:27 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/26 00:22:16 espie Exp $
@pkgpath devel/libgsf
@pkgpath devel/libgsf,no_gnome
include/libgsf-1/
include/libgsf-1/gsf/

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.12 2006/10/12 08:00:19 jakob Exp $
# $OpenBSD: Makefile,v 1.13 2006/11/26 00:26:40 espie Exp $
COMMENT= "ISC DHCP Server"
COMMENT-main= "ISC DHCP Server"
COMMENT-client= "ISC DHCP Client"
COMMENT-omapi= "ISC DHCP OMAPI"
@ -12,7 +12,7 @@ CATEGORIES= net
DISTFILES= dhcp-${VERSION}.tar.gz
WRKDIST= ${WRKDIR}/dhcp-${VERSION}
PKGNAME= isc-dhcp-server-${VERSION}
PKGNAME-main= isc-dhcp-server-${VERSION}p0
PKGNAME-client= isc-dhcp-client-${VERSION}p0
PKGNAME-omapi= isc-dhcp-omapi-${VERSION}p0
@ -31,8 +31,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
NO_REGRESS= Yes
MULTI_PACKAGES= -omapi -client
SUBPACKAGE?=
MULTI_PACKAGES= -main -omapi -client
CONFIGURE_STYLE= simple

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.5 2005/08/16 18:28:56 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/26 00:26:40 espie Exp $
@conflict isc-dhcp-*
@pkgpath net/isc-dhcp
@man man/cat5/dhcp-eval.0
@man man/cat5/dhcp-options.0
@man man/cat5/dhcpd.conf.0