6 files changed, 91 insertions, 23 deletions

diff --git a/security/dazuko/Makefile b/security/dazuko/Makefile
index bd145b77187c..8a1db221ec63 100644
--- a/security/dazuko/Makefile
+++ b/security/dazuko/Makefile
@@ -5,26 +5,40 @@
 # $FreeBSD$
 
 PORTNAME=	dazuko
-PORTVERSION=	2.1.0
+PORTVERSION=	2.2.0
 CATEGORIES=	security
 MASTER_SITES=	http://dazuko.org/files/
 
-MAINTAINER=	rob@debank.tv
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	A common interface for 3rd party file access control
 
 HAS_CONFIGURE=	yes
+SUB_FILES=	pkg-message
+
+OPTIONS=	EXAMPLEC	"Install C example programs"	on
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600000
-IGNORE=		"Only supports FreeBSD 4.X and 5.X"
+.if defined(WITH_EXAMPLEC)
+PLIST_FILES=	%%EXAMPLESDIR%%/example %%EXAMPLESDIR%%/example_mt
+PLIST_DIRS=	%%EXAMPLESDIR%%
 .endif
 
+post-configure:
+	${REINPLACE_CMD} -e 's|^NOMAN|NO_MAN|g' ${WRKSRC}/library/Makefile
+
 do-install:
-	${MKDIR} ${PREFIX}/modules/
-	${INSTALL_DATA} ${WRKSRC}/dazuko.ko ${PREFIX}/modules/dazuko.ko
+.if defined(WITH_EXAMPLEC)
+	@cd ${WRKSRC}/example_c && \
+		${MAKE}
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/example_c/example ${WRKSRC}/example_c/example_mt ${EXAMPLESDIR}
+.endif
+
+	@${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} -DMODULES_WITH_WORLD install
 
 post-install:
-	${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/security/dazuko/distinfo b/security/dazuko/distinfo
index c77e5e53a0b5..e457e0ebc025 100644
--- a/security/dazuko/distinfo
+++ b/security/dazuko/distinfo
@@ -1,3 +1,3 @@
-MD5 (dazuko-2.1.0.tar.gz) = f7e5ea23a0b3a1539bd0c0b96df426f0
-SHA256 (dazuko-2.1.0.tar.gz) = 95a672346e85062b06e855efeaed38cf161f8fce8ee9081958fd7acb1fb7f517
-SIZE (dazuko-2.1.0.tar.gz) = 159456
+MD5 (dazuko-2.2.0.tar.gz) = bbe7651888d9904fb6c82fdb02331d82
+SHA256 (dazuko-2.2.0.tar.gz) = 7bf51cefb36a1c572ed16bd4c184087a3903afb88fa8faee8bba22b8c4de29df
+SIZE (dazuko-2.2.0.tar.gz) = 162903
diff --git a/security/dazuko/files/pkg-message.in b/security/dazuko/files/pkg-message.in
new file mode 100644
index 000000000000..2137c33fec88
--- /dev/null
+++ b/security/dazuko/files/pkg-message.in
@@ -0,0 +1,16 @@
+#########################################################################################
+
+1) Create device /dev/dazuko
+
+   * FreeBSD 4.x
+    
+     # mknod /dev/dazuko c 33 0
+
+   * FreeBSD >= 5.x
+
+     It's not neccesary on modern FreeBSD systems
+
+2) If you selected WITH_EXAMPLEC, you can test module using example and example_mt files
+   from %%EXAMPLESDIR%% directory.
+
+#########################################################################################
diff --git a/security/dazuko/pkg-deinstall b/security/dazuko/pkg-deinstall
index fa1377823c16..ca77a9d0b971 100644
--- a/security/dazuko/pkg-deinstall
+++ b/security/dazuko/pkg-deinstall
@@ -1,8 +1,27 @@
 if [ ! "$2" = "POST-DEINSTALL" ]; then
-	exit 0
-fi
+	MODULENAME=dazuko
+	FREEBSDVER=`uname -r | cut -f 1 -d .`
+
+	kldstat -n ${MODULENAME} > /dev/null 2>&1; RESULT=$?
+	if [ ${RESULT} -eq 0 ]; then
+		kldunload -f -n ${MODULENAME}
+	fi
 
-echo ""
-echo "If you want to completely remove this package"
-echo "remove /dev/dazuko"
-echo ""
+	if [ "${FREEBSDVER}" = "4" ]; then
+		rm /modules/${MODULENAME}.ko
+	else
+		rm /boot/modules/${MODULENAME}.ko		
+	fi
+	
+	if [ -f /boot/modules/linker.hints ]; then
+		rm /boot/modules/linker.hints
+	fi
+	
+	if [ -f /boot/loader.conf ]; then
+		cat /boot/loader.conf | grep ${MODULENAME} > /dev/null 2>&1; RESULT=$?
+        	if [ ${RESULT} -eq 0 ]; then
+			sed -i '' -e "/^${MODULENAME}_load.*/d" /boot/loader.conf
+		fi
+	fi
+fi
+exit 0
diff --git a/security/dazuko/pkg-install b/security/dazuko/pkg-install
index 34c41281e8e7..135a5842737d 100644
--- a/security/dazuko/pkg-install
+++ b/security/dazuko/pkg-install
@@ -1,11 +1,32 @@
 #!/bin/sh
 
 if [ "$2" = "POST-INSTALL" ]; then
-	if ! [ -c /dev/dazuko ]; then
-		mknod /dev/dazuko c 33 0
+
+MODULENAME=dazuko
+
+echo -n "Do you want load ${MODULENAME}.ko? [ y/n ]: "
+read LOADMOD
+echo
+
+	if [ x"${LOADMOD}" = x"y" ]; then
+		kldstat -n ${MODULENAME} > /dev/null 2>&1; RESULT=$?
+		if [ ${RESULT} -eq 0 ]; then
+			kldunload -f -n ${MODULENAME}
+		fi
+		kldload ${MODULENAME}
 	fi
-	echo ""
-	echo "To load the module do kldload $1/modules/dazuko.ko"
-	echo ""
+
+echo -n "Do you want load ${MODULENAME}.ko on boot time? [ y/n ]: "
+read BOOTMOD
+echo
+
+	if [ x"${BOOTMOD}" = x"y" ]; then
+		cat /boot/loader.conf | grep ${MODULENAME} > /dev/null 2>&1; RESULT=$?
+		if [ ${RESULT} -eq 0 ]; then
+			sed -i '' -e 's/^${MODULENAME}_load.*/${MODULENAME}_load="YES"/g' /boot/loader.conf
+		else
+		echo "${MODULENAME}_load=\"YES\"" >> /boot/loader.conf
+		fi
+        fi
 fi
 exit 0
diff --git a/security/dazuko/pkg-plist b/security/dazuko/pkg-plist
deleted file mode 100644
index 65115540657c..000000000000
--- a/security/dazuko/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-modules/dazuko.ko
-@dirrmtry modules