From 64bbcd996f14e701a93bd6f3b9d43acaa33635a8 Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Thu, 24 Sep 2009 14:17:48 +0000
Subject: - Always install header files and remove DEVEL option

Feature safe:	yes
---
 sysutils/nut/Makefile  | 28 ++++++++++------------------
 sysutils/nut/pkg-plist |  6 +++---
 2 files changed, 13 insertions(+), 21 deletions(-)

(limited to 'sysutils/nut')

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index cb6939812b9c..8882b3ab6420 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nut
 PORTVERSION=	2.4.1
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
@@ -33,13 +33,18 @@ OPTIONS=	SERIAL		"SERIAL support"	on \
 		PDU		"Powerman PDU support"	off \
 		HAL		"HAL support"	off \
 		IPV6		"IPV6 support"  on \
-		DEVEL		"Install header files"	off \
-		CGI		"Web CGI interface"	off \
+		CGI		"Web CGI interface"	off
 
 USE_RC_SUBR=	nut.sh nut_upsmon.sh nut_upslog.sh
 SUB_LIST+=	STATEDIR=${STATEDIR}
 PLIST_SUB+=	STATEDIR=${STATEDIR}
 
+MAN3=		upscli_connect.3 upscli_disconnect.3 upscli_fd.3 \
+		upscli_get.3 upscli_list_next.3 upscli_list_start.3 \
+		upscli_readline.3 upscli_sendline.3 upscli_splitaddr.3 \
+		upscli_splitname.3 upscli_ssl.3 upscli_strerror.3 \
+		upscli_upserror.3 upsclient.3
+
 MAN5=		ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \
 		upssched.conf.5
 
@@ -60,7 +65,8 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--with-pidpath=${STATEDIR} \
 		--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
 		--with-user=${NUT_USER} \
-		--with-group=${NUT_GROUP}
+		--with-group=${NUT_GROUP} \
+		--with-dev
 
 .if defined(WITH_CGI)
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
@@ -163,20 +169,6 @@ CONFIGURE_ARGS+=	--with-ipv6
 CONFIGURE_ARGS+=	--without-ipv6
 .endif
 
-.if defined(WITH_DEVEL)
-CONFIGURE_ARGS+=	--with-dev
-MAN3+=		upscli_connect.3 upscli_disconnect.3 upscli_fd.3 \
-		upscli_get.3 upscli_list_next.3 upscli_list_start.3 \
-		upscli_readline.3 upscli_sendline.3 upscli_splitaddr.3 \
-		upscli_splitname.3 upscli_ssl.3 upscli_strerror.3 \
-		upscli_upserror.3 upsclient.3
-
-PLIST_SUB+=	NUT_DEVEL=""
-.else
-CONFIGURE_ARGS+=	--without-dev
-PLIST_SUB+=	NUT_DEVEL="@comment "
-.endif
-
 pre-install:
 	@${MKDIR} ${PREFIX}/libexec/nut
 	@${MKDIR} ${STATEDIR}
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index 894de723587f..b9cac9e465a7 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -14,8 +14,8 @@ etc/nut/upsd.conf.sample
 etc/nut/upsd.users.sample
 etc/nut/upsmon.conf.sample
 etc/nut/upssched.conf.sample
-%%NUT_DEVEL%%include/parseconf.h
-%%NUT_DEVEL%%include/upsclient.h
+include/parseconf.h
+include/upsclient.h
 lib/libupsclient.so.1
 lib/libupsclient.so
 lib/libupsclient.la
@@ -68,7 +68,7 @@ lib/libupsclient.la
 libexec/nut/upsdrvctl
 %%NUT_USB%%libexec/nut/usbhid-ups
 %%NUT_SERIAL%%libexec/nut/victronups
-%%NUT_DEVEL%%libdata/pkgconfig/libupsclient.pc
+libdata/pkgconfig/libupsclient.pc
 sbin/upsd
 sbin/upsmon
 sbin/upssched
-- 
cgit v1.2.3