From 2b05516cd2a353ff7c29c0b0b52102df141c02ef Mon Sep 17 00:00:00 2001
From: Sam Lawrance <lawrance@FreeBSD.org>
Date: Sat, 8 Oct 2005 07:44:07 +0000
Subject: - Fix pkg-plist - Minor tweaking and cleanups

PR:		ports/85989
Submitted by:	Graham Todd <gtodd@bellanet.org> (maintainer)
---
 security/pks/Makefile               | 11 ++++++-----
 security/pks/files/pkg-deinstall.in | 27 +++++++++++++++++++++++++++
 security/pks/files/pkg-message.in   | 11 +++++++++++
 security/pks/pkg-deinstall          | 27 ---------------------------
 security/pks/pkg-message            | 11 -----------
 security/pks/pkg-plist              |  4 +++-
 6 files changed, 47 insertions(+), 44 deletions(-)
 create mode 100644 security/pks/files/pkg-deinstall.in
 create mode 100644 security/pks/files/pkg-message.in
 delete mode 100644 security/pks/pkg-deinstall
 delete mode 100644 security/pks/pkg-message

(limited to 'security/pks')

diff --git a/security/pks/Makefile b/security/pks/Makefile
index c06ff6935899..e24a21309dfa 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -18,24 +18,25 @@ LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/pks --localstatedir=/var/pks \
-		--sysconfdir=${PREFIX}/share/examples \
+		--sysconfdir=${EXAMPLESDIR} \
 		--libdir=${LOCALBASE}/lib --with-libwrap
-CFLAGS+=	-I/usr/local/include/db2
+CFLAGS+=	-I${LOCALBASE}/include/db2
 MAKE_ENV+=	LDFLAGS=-L${LOCALBASE}/lib SUBDIRS=
 
 USE_RC_SUBR=	pksd.sh
 MAN5=		pksd.conf.5
 MAN8=		pks-intro.8 pksclient.8 pksd.8 pksdctl.8
 USE_REINPLACE=	yes
+SUB_FILES=	pkg-message pkg-deinstall
 
 # remove embedded sleepycat, remove associated build commands, make
 # the build use the headers and libraries from the db2 port
 post-patch:
 	${RM} -rf ${WRKSRC}/db2-sleepycat
 	${REINPLACE_CMD} 's|SUBDIRS =.*|SUBDIRS =|; \
-			  s|LIBDB =.*|LIBDB = -L/usr/local/lib -ldb2|; \
-			  s|DBDIR =.*|DBDIR = /usr/local/include/db2|' \
-			  ${WRKSRC}/Makefile.in 
+			  s|LIBDB =.*|LIBDB = -L${LOCALBASE}/lib -ldb2|; \
+			  s|DBDIR =.*|DBDIR = ${LOCALBASE}/include/db2|' \
+			  ${WRKSRC}/Makefile.in
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pksd.sh ${PREFIX}/etc/rc.d/pksd.sh
diff --git a/security/pks/files/pkg-deinstall.in b/security/pks/files/pkg-deinstall.in
new file mode 100644
index 000000000000..5b748ca2d78a
--- /dev/null
+++ b/security/pks/files/pkg-deinstall.in
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD: /tmp/pcvs/ports/security/pks/files/pkg-deinstall.in,v 1.1 2005-10-08 07:44:07 lawrance Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	cat << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want to remove the
+following directories and files:
+
+        %%PREFIX%%/etc/pksd.conf
+	/var/pks
+===========================================================================
+EOF
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/security/pks/files/pkg-message.in b/security/pks/files/pkg-message.in
new file mode 100644
index 000000000000..7e72db0ec54f
--- /dev/null
+++ b/security/pks/files/pkg-message.in
@@ -0,0 +1,11 @@
+
+
+	##################################
+
+	  To enable adding keys via the
+	  web interface please edit the
+	  configuration file at:
+
+	   %%PREFIX%%/etc/pks/pksd.conf
+
+	##################################
diff --git a/security/pks/pkg-deinstall b/security/pks/pkg-deinstall
deleted file mode 100644
index 9fc2e9fddf84..000000000000
--- a/security/pks/pkg-deinstall
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-DEINSTALL)
-	;;
-POST-DEINSTALL)
-	cat << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove the
-following directories and files:
-
-        ${PREFIX}/etc/pksd.conf
-	/var/pks
-===========================================================================
-EOF
-	;;
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/security/pks/pkg-message b/security/pks/pkg-message
deleted file mode 100644
index b96a749917f7..000000000000
--- a/security/pks/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	##################################
-
-	  To enable adding keys via the
-	  web interface please edit the
-	  configuration file at:
-
-	   /usr/local/etc/pks/pksd.conf
-
-	##################################
diff --git a/security/pks/pkg-plist b/security/pks/pkg-plist
index d533db70c3d0..b81ba6ea7a9a 100644
--- a/security/pks/pkg-plist
+++ b/security/pks/pkg-plist
@@ -5,7 +5,7 @@ bin/pksclient
 sbin/pksd
 bin/pksdctl
 etc/pksd.conf.sample
-share/pks/mail_intro
+%%DATADIR%%/mail_intro
 %%PORTDOCS%%%%DOCSDIR%%/mail_intro
 %%PORTDOCS%%%%DOCSDIR%%/pks_help.en
 %%PORTDOCS%%%%DOCSDIR%%/pks_help.es
@@ -14,4 +14,6 @@ share/pks/mail_intro
 %%PORTDOCS%%%%DOCSDIR%%/pks_help.cz
 %%PORTDOCS%%%%DOCSDIR%%/pks_help.ja
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/pksd.conf
+@dirrm %%EXAMPLESDIR%%
 @dirrm share/pks
-- 
cgit v1.2.3