From ee261811d7c9f220bc2257bbc85ef8cd7a5dd676 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Tue, 23 Sep 2003 00:12:51 +0000
Subject: [PATCH] spin off hpcdtoppm into subpackage for licensing reasons; ok
 pvalchev@

---
 graphics/netpbm/Makefile       | 20 +++++++++++++++++---
 graphics/netpbm/pkg/DESCR-hpcd |  4 ++++
 graphics/netpbm/pkg/PLIST-hpcd |  3 +++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 graphics/netpbm/pkg/DESCR-hpcd
 create mode 100644 graphics/netpbm/pkg/PLIST-hpcd

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 919f08faa0b..362fff1c756 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,10 +1,13 @@
-# $OpenBSD: Makefile,v 1.28 2003/03/29 04:13:54 brad Exp $
+# $OpenBSD: Makefile,v 1.29 2003/09/23 00:12:51 naddy Exp $
 # $NetBSD: Makefile,v 1.25 1999/03/04 14:18:54 tron Exp $
 
 COMMENT=	"toolkit for converting images between different formats"
+COMMENT-hpcd=	"convert photo CD images into ppm format"
 
-DISTNAME=	netpbm-9.24
+VERSION=	9.24
+DISTNAME=	netpbm-${VERSION}
 PKGNAME=	${DISTNAME}p1
+PKGNAME-hpcd=	hpcdtoppm-${VERSION}p1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
@@ -17,10 +20,17 @@ LIB_DEPENDS=	tiff.35::graphics/tiff \
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
 
+MULTI_PACKAGES=	-hpcd
+SUBPACKAGE?=
+
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_CDROM=	"no fee"
+.if ${SUBPACKAGE} == "-hpcd"
+PERMIT_PACKAGE_CDROM=	"no fee"
+.else
 PERMIT_PACKAGE_CDROM=	Yes
+.endif
 
 MAKE_FLAGS=	CC="${CC}"
 FAKE_FLAGS=	${MAKE_FLAGS} PREFIX="${WRKINST}${TRUEPREFIX}"
@@ -42,6 +52,10 @@ pre-build:
 
 NO_REGRESS=	Yes
 
+.if defined(PACKAGING) && ${SUBPACKAGE} == "-hpcd"
+LIB_DEPENDS=	pbm.1,pgm.1,ppm.1::graphics/netpbm
+.endif
+
 .include <bsd.port.mk>
 
 .if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
diff --git a/graphics/netpbm/pkg/DESCR-hpcd b/graphics/netpbm/pkg/DESCR-hpcd
new file mode 100644
index 00000000000..90dfeec7851
--- /dev/null
+++ b/graphics/netpbm/pkg/DESCR-hpcd
@@ -0,0 +1,4 @@
+Hadmut's pcd to ppm converter converts photo CD images to the ppm
+format of netpbm.
+
+WWW: ${HOMEPAGE}
diff --git a/graphics/netpbm/pkg/PLIST-hpcd b/graphics/netpbm/pkg/PLIST-hpcd
new file mode 100644
index 00000000000..f7d1b0c5e5c
--- /dev/null
+++ b/graphics/netpbm/pkg/PLIST-hpcd
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST-hpcd,v 1.1 2003/09/23 00:12:51 naddy Exp $
+bin/hpcdtoppm
+man/man1/hpcdtoppm.1