svn commit: r359413 - head/security/aide

[Cy Schubert]

Author: cy
Date: Thu Jun 26 19:41:02 2014
New Revision: 359413
URL: http://svnweb.freebsd.org/changeset/ports/359413
QAT: https://qat.redports.org/buildarchive/r359413/

Log:
  Support stage.
  
  Remove redundant database creation already in pkg-plist.

Modified:
  head/security/aide/Makefile
  head/security/aide/pkg-plist

Modified: head/security/aide/Makefile
==============================================================================
--- head/security/aide/Makefile	Thu Jun 26 19:37:31 2014	(r359412)
+++ head/security/aide/Makefile	Thu Jun 26 19:41:02 2014	(r359413)
@@ -12,10 +12,9 @@ MASTER_SITES=	SF \
 MAINTAINER=	cy at FreeBSD.org
 COMMENT=	Replacement and extension for Tripwire
 
-LIB_DEPENDS=	mhash.2:${PORTSDIR}/security/mhash
+LIB_DEPENDS=	libmhash.so:${PORTSDIR}/security/mhash
 USES=		bison gmake
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 USE_AUTOTOOLS=	autoconf
@@ -34,30 +33,9 @@ MAN5=		aide.conf.5
 SUB_FILES=	pkg-message
 
 post-install:
-	@${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${PREFIX}/etc/aide.conf.sample
-	@if [ ! -f ${PREFIX}/etc/aide.conf ]; then \
-		${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${PREFIX}/etc/aide.conf ; \
+	@${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${STAGEDIR}${PREFIX}/etc/aide.conf.sample
+	@if [ ! -f ${STAGEDOIR}${PREFIX}/etc/aide.conf ]; then \
+		${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${STAGEDIR}${PREFIX}/etc/aide.conf ; \
 	fi
-	@if [ ! -d /var/db/aide/databases ]; then \
-		${MKDIR} /var/db/aide/databases; \
-		${CHOWN} root:wheel /var/db/aide ; \
-		${CHOWN} root:wheel /var/db/aide/databases ; \
-		${CHMOD} 0700 /var/db/aide ; \
-		${CHMOD} 0700 /var/db/aide/databases ; \
-	fi
-	@${ECHO}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
-.if defined(AIDE_FLOPPY)
-	@disklabel -w -B /dev/rfd0c fd1440
-	@newfs -u 0 -t 0 -i 196608 -m 0 -T minimum -o space /dev/rfd0c
-	@mount /dev/fd0c /mnt
-	@${CP} ${PREFIX}/bin/aide /mnt/aide
-	@${CP} -p /var/db/aide/aide.conf /mnt/aide.conf
-	@${CP} < /var/db/aide/databases/aide.db /mnt/aide.db
-	@${CHMOD} 555 /mnt/aide
-	@umount /mnt
-	@${ECHO} Do not forget to remove and write-protect the floppy.
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/security/aide/pkg-plist
==============================================================================
--- head/security/aide/pkg-plist	Thu Jun 26 19:37:31 2014	(r359412)
+++ head/security/aide/pkg-plist	Thu Jun 26 19:41:02 2014	(r359413)
@@ -1,12 +1,11 @@
 bin/aide
 @unexec if cmp -s %D/etc/aide.conf %D/etc/aide.conf.sample; then rm -f %D/etc/aide.conf; fi
 etc/aide.conf.sample
+man/man1/aide.1.gz
+man/man5/aide.conf.5.gz
 @exec [ ! -f %B/aide.conf ] && cp %B/%f %B/aide.conf
 @exec /bin/mkdir -p /var/db/aide/databases
 @exec [ -f /var/db/aide/aide.conf ] || /usr/sbin/chown root:wheel /var/db/aide
 @exec [ -f /var/db/aide/aide.conf ] || /usr/sbin/chown root:wheel /var/db/aide/databases
 @exec [ -f /var/db/aide/aide.conf ] || /bin/chmod 0700 /var/db/aide
 @exec [ -f /var/db/aide/aide.conf ] || /bin/chmod 0700 /var/db/aide/databases
- at unexec rmdir /var/db/aide/databases 2>/dev/null || true
- at unexec rmdir /var/db/aide 2>/dev/null || true
- at unexec rmdir /var/db 2>/dev/null || true