new MULTI_PACKAGES

net/tightvnc/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2006/08/03 23:15:58 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2006/11/21 10:23:47 espie Exp $
 
-COMMENT=	"cross-platform remote desktop access"
+COMMENT-main=	"cross-platform remote desktop access"
 COMMENT-viewer=	"client for cross-platform remote desktop access"
 
 VERSION=	1.2.9
-PKGNAME=	tightvnc-${VERSION}
+PKGNAME-main=	tightvnc-${VERSION}p0
 PKGNAME-viewer=	tightvnc-viewer-${VERSION}
 DISTNAME=	tightvnc-${VERSION}_unixsrc
 CATEGORIES=	net
@@ -18,17 +18,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext c z 
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
 
-LIB_DEPENDS=	jpeg.>=62.::graphics/jpeg
 USE_X11=	Yes
 
 WRKDIST=	${WRKDIR}/vnc_unixsrc
 
-MULTI_PACKAGES=	-viewer
-SUBPACKAGE?=
+MULTI_PACKAGES=	-main -viewer
 
 CONFIGURE_STYLE=imake
 
@@ -36,15 +33,13 @@ ALL_TARGET=	World
 
 NO_REGRESS=	Yes
 
-.if defined(PACKAGING)
-.  if ${SUBPACKAGE} == "-viewer"
-WANTLIB+=	ICE SM Xaw Xmu Xp Xpm Xt 
-.  else
-RUN_DEPENDS=	:tightvnc-viewer-${VERSION}:net/tightvnc,-viewer
-LIB_DEPENDS=
-WANTLIB+=	m
-.  endif
-.endif
+WANTLIB=		X11 Xext c z 
+
+WANTLIB-viewer=		${WANTLIB} ICE SM Xaw Xmu Xp Xpm Xt 
+LIB_DEPENDS-viewer=	jpeg.>=62.::graphics/jpeg
+
+RUN_DEPENDS-main=	:tightvnc-viewer-${VERSION}:net/tightvnc,-viewer
+WANTLIB-main=		${WANTLIB} m
 
 DOCUMENTATION=	vncserver.man vncpasswd/vncpasswd.man vncconnect/vncconnect.man \
 		Xvnc/programs/Xserver/Xvnc.man vncviewer/vncviewer.man

net/tightvnc/pkg/PLIST-main

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.13 2005/10/07 18:52:58 alek Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 10:23:48 espie Exp $
+@pkgpath net/tightvnc
 bin/Xvnc
 bin/vncconnect
 bin/vncpasswd