Index: security/samhain/Makefile
===================================================================
--- security/samhain/Makefile
+++ security/samhain/Makefile
@@ -42,8 +42,7 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--with-logserver=true \
+CONFIGURE_ARGS=	--with-logserver=true \
 		--with-altlogserver=true \
 		--with-timeserver=true \
 		--with-alttimeserver=true
@@ -61,8 +60,8 @@
 
 ENCRYPT_CONFIGURE_ENABLE=	encrypt
 
-GNUPG_CONFIGURE_WITH=		gpg=${PREFIX}/bin/gpg
-GNUPG_BUILD_DEPENDS=		gpg:${PORTSDIR}/security/gnupg
+GNUPG_CONFIGURE_WITH=		gpg=${LOCALBASE}/bin/gpg
+GNUPG_BUILD_DEPENDS=		gpg:security/gnupg
 
 IPV6_CONFIGURE_ENABLE=		ipv6
 
@@ -93,7 +92,7 @@
 
 POSIX_ACL_CONFIGURE_ENABLE=	posix-acl
 
-PRELUDE_LIB_DEPENDS=		prelude:${PORTSDIR}/security/libprelude
+PRELUDE_LIB_DEPENDS=		prelude:security/libprelude
 PRELUDE_CONFIGURE_WITH=		prelude
 
 PTRACE_CONFIGURE_ENABLE=	ptrace
@@ -123,53 +122,34 @@
 .endif
 
 .if defined(WITH_CLIENT)
+CONFFILE=		${PREFIX}/etc/samhainrc.sample
 CONFIGURE_ARGS+=	--enable-network=client \
 			--with-data-file=REQ_FROM_SERVER/var/lib/samhain/data.samhain \
 			--with-config-file=REQ_FROM_SERVER
 PLIST_SUB+=		SAMHAIN="" SETPWD="" YULE="@comment "
-EXTRA_PATCHES+=		${FILESDIR}/fixsamhainrc.patch
 MAN5+=			samhainrc.5
 MAN8+=			samhain.8
 .elif defined(WITH_SERVER)
+CONFFILE=		${PREFIX}/etc/yulerc.sample
 USERS=			yule
 GROUPS=			yule
 CONFIGURE_ARGS+=	--enable-network=server
 SUB_LIST+=		WITH_YULE="yes"
 PLIST_SUB+=		YULE="" SAMHAIN="@comment " SETPWD="@comment "
-EXTRA_PATCHES+=		${FILESDIR}/fixyulerc.patch
 MAN5+=			yulerc.5
 MAN8+=			yule.8
 .else
+CONFFILE=		${PREFIX}/etc/samhainrc.sample
 SUB_LIST+=		WITH_YULE=""
 PLIST_SUB+=		SAMHAIN="" YULE="@comment " SETPWD="@comment "
-EXTRA_PATCHES+=		${FILESDIR}/fixsamhainrc.patch
 MAN5+=			samhainrc.5
 MAN8+=			samhain.8
 .endif
 
-pre-everything::
-
-.if !defined(WITH_CLIENT) && !defined(WITH_SERVER)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Building Samhain in standalone mode."
-	@${ECHO_MSG} "If you wish to enable networked mode, please hit CTRL-C"
-	@${ECHO_MSG} "now, and build samhain from the samhain-client and"
-	@${ECHO_MSG} "samhain-server ports."
-	@${ECHO_MSG}
-.endif
-
 .if defined(WITH_CLIENT) && defined(WITH_SERVER)
 IGNORE=		can't build client and server at once
 .endif
 
-.if ${PORT_OPTIONS:MKCHECK}
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Building with kernel checking requires reading /dev/kmem"
-	@${ECHO_MSG} "and /dev/mem. If you're not building as root, please hit"
-	@${ECHO_MSG} "Control-C and restart the build as root."
-	@${ECHO_MSG}
-.endif
-
 .if ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MXML_LOGS}
 IGNORE=		xml logging is required to log to MySQL
 .endif
@@ -181,15 +161,20 @@
 post-extract:
 	@${TAR} -C ${WRKDIR} -xzf ${WRKSRC}.tar.gz
 	@${RM} ${WRKSRC}.tar.gz ${WRKSRC}.tar.gz.asc
+	@${REINPLACE_CMD} -e 's|@myconffile@|${CONFFILE}|' ${WRKSRC}/samhain-install.sh.in
 
 post-install:
 .if !defined(WITH_SERVER)
 	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/samhain.sh
 	@${CP} ${WRKSRC}/samhainrc ${STAGEDIR}${PREFIX}/etc/samhainrc.sample
 	@${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc/samhainrc.sample
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain
 .else
 	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/yule.sh
 	@${CP} ${WRKSRC}/yulerc ${STAGEDIR}${PREFIX}/etc/yulerc.sample
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yulectl
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule_setpwd
 .endif
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/MANUAL-2_4.pdf ${STAGEDIR}${DOCSDIR}
@@ -203,18 +188,8 @@
 	${INSTALL_MAN} ${WRKSRC}/docs/BUGS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/sh_mounts.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/sh_userfiles.txt ${STAGEDIR}${DOCSDIR}
-
-post-stage:
-.if !defined(WITH_SERVER)
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain
-.endif
 .if defined(WITH_CLIENT)
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain_setpwd
-.endif
-.if defined(WITH_SERVER)
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yulectl
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule_setpwd
 .endif
 
 .include <bsd.port.post.mk>
Index: security/samhain/files/fixsamhainrc.patch
===================================================================
--- security/samhain/files/fixsamhainrc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- samhain-install.sh.in	Wed Jan 15 16:51:57 2003
-+++ samhain-install.sh.in	Wed Jan 15 16:52:10 2003
-@@ -13,7 +13,7 @@
- mandir=@mandir@
- 
- sysconfdir=@sysconfdir@
--configfile=@myconffile@
-+configfile=/usr/local/etc/samhainrc.sample
- 
- pid_file=@mylockfile@
- pid_dir=@mylockdir@
Index: security/samhain/files/fixyulerc.patch
===================================================================
--- security/samhain/files/fixyulerc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- samhain-install.sh.in	Wed Jan 15 16:51:57 2003
-+++ samhain-install.sh.in	Wed Jan 15 16:52:10 2003
-@@ -13,7 +13,7 @@
- mandir=@mandir@
- 
- sysconfdir=@sysconfdir@
--configfile=@myconffile@
-+configfile=/usr/local/etc/yulerc.sample
- 
- pid_file=@mylockfile@
- pid_dir=@mylockdir@