4 files changed, 29 insertions, 41 deletions

diff --git a/security/snoopy/Makefile b/security/snoopy/Makefile
index 66237820b691..a1240401dfad 100644
--- a/security/snoopy/Makefile
+++ b/security/snoopy/Makefile
@@ -4,23 +4,24 @@
 # $FreeBSD$
 
 PORTNAME=	snoopy
-PORTVERSION=	1.3
+PORTVERSION=	1.6.1
 CATEGORIES=	security
-MASTER_SITES=	SF/${PORTNAME}logger/${PORTNAME}logger/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}logger/${PORTNAME}logger/
 
-MAINTAINER=	jadawin@FreeBSD.org
+MAINTAINER=	baptiste.daroussin@gmail.com
 COMMENT=	An execve() wrapper and logger
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 PLIST_FILES=	lib/snoopy.so bin/detect
 PORTDOCS=	README
 
-.include <bsd.port.pre.mk>
+GNU_CONFIGURE=	yes
 
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+=	-fPIC
-.endif
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/README
+	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/README
+	@${REINPLACE_CMD} '/^LIBS.*/d' ${WRKSRC}/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/snoopy.so ${PREFIX}/lib
@@ -30,4 +31,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/snoopy/distinfo b/security/snoopy/distinfo
index 14cd9a465d00..14ab0a3b7c4b 100644
--- a/security/snoopy/distinfo
+++ b/security/snoopy/distinfo
@@ -1,3 +1,3 @@
-MD5 (snoopy-1.3.tar.gz) = 7f1bfc5c10f05cd127b414facc43cc5f
-SHA256 (snoopy-1.3.tar.gz) = 99d60a36a42220fc4de99a69d722c736879dedde27121867a1d575fabb0404a7
-SIZE (snoopy-1.3.tar.gz) = 10423
+MD5 (snoopy-1.6.1.tar.gz) = 7a8186e45d959e1b3ed44805bfcd4467
+SHA256 (snoopy-1.6.1.tar.gz) = a10150592292a6b039d5b00bb1bfe847d14cb66ef7e30b5c546bcfbfddf5e805
+SIZE (snoopy-1.6.1.tar.gz) = 98426
diff --git a/security/snoopy/files/patch-Makefile b/security/snoopy/files/patch-Makefile
deleted file mode 100644
index 5736f458a08f..000000000000
--- a/security/snoopy/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	Thu Dec 21 07:53:15 2000
-+++ Makefile	Tue Feb  6 22:35:12 2007
-@@ -1,15 +1,12 @@
- # Makefile for snoopy
- # $Id: Makefile,v 1.3 2000/12/10 08:50:49 marius Exp $
- 
--CC = gcc
--LIBS  = -ldl
--
- all: snoopy.so detect
- 
- snoopy.so:  snoopy.c snoopy.h
--			$(CC) -shared -O3 -fomit-frame-pointer snoopy.c -osnoopy.so $(LIBS)
-+			$(CC) -shared $(CFLAGS) snoopy.c -osnoopy.so
- detect: detect.c
--			$(CC) detect.c -odetect $(LIBS)
-+			$(CC) $(CFLAGS) detect.c -odetect
- install: all 
- 			install -m 755 snoopy.so /lib/snoopy.so; \
- 			./install.sh
diff --git a/security/snoopy/files/patch-README b/security/snoopy/files/patch-README
index 71436215d7d3..c90c471f0223 100644
--- a/security/snoopy/files/patch-README
+++ b/security/snoopy/files/patch-README
@@ -1,11 +1,18 @@
---- README.orig	Tue Feb  6 22:38:07 2007
-+++ README	Tue Feb  6 22:38:22 2007
-@@ -39,7 +39,7 @@
-   the $LD_PRELOAD environment variable - simply set it to /lib/snoopy.so
-   before loading the application. For example:
+--- ./README.orig	2010-02-11 21:58:07.000000000 +0100
++++ ./README	2010-07-20 17:45:31.306297157 +0200
+@@ -46,11 +46,11 @@
+   Snoopy is placed in /etc/ld.so.preload to trap all occurances of exec,
+   if you wish to monitor only certain applications you can do so through
+   the $LD_PRELOAD environment variable - simply set it to 
+-  /usr/local/lib/snoopy.so before loading the application. For example:
++  %%PREFIX%%/lib/snoopy.so before loading the application. For example:
  
--     export LD_PRELOAD=/lib/snoopy.so
-+     export LD_PRELOAD=%%PREFIX%%/lib/snoopy.so
-      lynx http://linux.com/
-      unset LD_PRELOAD 
+-    export LD_PRELOAD=/usr/local/lib/snoopy.so
+-    lynx http://linux.com/
++    export LD_PRELOAD=%%PREFIX%%/lib/snoopy.so
++    lynx http://freebsd.org
+     unset LD_PRELOAD
  
+   To remove snoopy later, simply edit /etc/ld.so.preload and remove the
+-  reference to snoopy.so and delete /usr/local/lib/snoopy.so.
++  reference to snoopy.so and delete %%PREFIX%%/lib/snoopy.so.