From c6ee029a2b1115699ff382ccbc9d23e1c9167411 Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Thu, 25 Oct 2007 14:58:29 +0000
Subject: Change to pass PKG_SYSCONFDIR to configure, fixes PR 37195. While
 here, change user/group and directory handling to the usual manner.

Bump PKGREVISION.
---
 net/tor/INSTALL  | 15 ---------------
 net/tor/Makefile | 20 +++++++++++++-------
 2 files changed, 13 insertions(+), 22 deletions(-)
 delete mode 100644 net/tor/INSTALL

(limited to 'net/tor')

diff --git a/net/tor/INSTALL b/net/tor/INSTALL
deleted file mode 100644
index f107394c016..00000000000
--- a/net/tor/INSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-#!@SH@
-#
-# $NetBSD: INSTALL,v 1.1 2005/02/14 18:51:58 jschauma Exp $
-
-PKG_HOME="@PKG_HOME@"
-TOR_USER="@TOR_USER@"
-TOR_GROUP="@TOR_GROUP@"
-
-case "${STAGE}" in
-PRE-INSTALL)
-    ${MKDIR} ${PKG_SYSCONFDIR}/tor
-    ${MKDIR} -m 0700 ${PKG_HOME}
-    ${CHOWN} ${TOR_USER}:${TOR_GROUP} ${PKG_HOME}
-    ;;
-esac
diff --git a/net/tor/Makefile b/net/tor/Makefile
index f8f4f62b7fe..63eedc6eea2 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2007/09/11 15:53:57 obache Exp $
+# $NetBSD: Makefile,v 1.47 2007/10/25 14:58:29 obache Exp $
 #
 
 DISTNAME=		tor-0.1.2.17
+PKGREVISION=		1
 CATEGORIES=		net security
 MASTER_SITES=		http://tor.eff.org/dist/
 
@@ -16,6 +17,7 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV+=		CPP=${CPP:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 
 TEST_TARGET=		check
 
@@ -23,6 +25,7 @@ TOR_USER?=		tor
 TOR_GROUP?=		tor
 PKG_HOME?=		${VARBASE}/chroot/tor
 BUILD_DEFS+=		VARBASE
+PKG_SYSCONFSUBDIR=	tor
 
 PKG_GROUPS_VARS+=	TOR_GROUP
 PKG_USERS_VARS+=	TOR_USER
@@ -30,18 +33,22 @@ PKG_USERS_VARS+=	TOR_USER
 RCD_SCRIPTS=		tor
 RCD_SCRIPT_SRC.tor=	${FILESDIR}/tor.in
 PKG_GROUPS=		${TOR_GROUP}
-PKG_USERS=		${TOR_USER}:${TOR_GROUP}::Torifier:${PKG_HOME}
+PKG_USERS=		${TOR_USER}:${TOR_GROUP}
+PKG_GECOS.${TOR_USER}=	Torifier
+PKG_HOME.${TOR_USER}=	${PKG_HOME}
 USER_GROUP=		${TOR_USER} ${TOR_GROUP}
 
-OWN_DIRS_PERMS+=	${PKG_HOME} ${USER_GROUP} 0755
+OWN_DIRS_PERMS+=	${PKG_HOME} ${USER_GROUP} 0700
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--with-libevent-dir=${LOCALBASE}
+.if !empty(BUILDLINK_PREFIX.libevent)
+CONFIGURE_ARGS+=	--with-libevent-dir=${BUILDLINK_PREFIX.libevent:Q}
+.endif
 
 CONF_FILES+=		${PREFIX}/share/examples/tor/tor-tsocks.conf 	\
-				${PKG_SYSCONFDIR}/tor/tor-tsocks.conf
+				${PKG_SYSCONFDIR}/tor-tsocks.conf
 CONF_FILES+=		${PREFIX}/share/examples/tor/torrc.sample 	\
-				${PKG_SYSCONFDIR}/tor/torrc
+				${PKG_SYSCONFDIR}/torrc
 
 FILES_SUBST+=		PKG_HOME=${PKG_HOME:Q}
 FILES_SUBST+=		TOR_USER=${TOR_USER:Q} TOR_GROUP=${TOR_GROUP:Q}
@@ -49,7 +56,6 @@ FILES_SUBST+=		TOR_USER=${TOR_USER:Q} TOR_GROUP=${TOR_GROUP:Q}
 CHECK_PORTABILITY_SKIP+=contrib/*
 
 post-install:
-	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/tor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tor
 	${INSTALL_DATA} ${WRKSRC}/src/config/torrc.sample		\
 		${PREFIX}/share/examples/tor/torrc.sample
-- 
cgit v1.2.3