7 files changed, 66 insertions, 95 deletions

diff --git a/mail/sigit/Makefile b/mail/sigit/Makefile
index de31513c522b..19eb7183dabc 100644
--- a/mail/sigit/Makefile
+++ b/mail/sigit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sigit
-PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTVERSION=	0.3.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.redhead.dk/download/stable/
 DISTNAME=	Sigit-${PORTVERSION}
@@ -15,15 +14,23 @@ DISTNAME=	Sigit-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool to create random signatures
 
-USE_PERL5=	yes
+BUILD_DEPENDS=	${LOCALBASE}/bin/boxes:${PORTSDIR}/misc/boxes
+
+LICENSE=	GPLv2
+
+USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
-WRKSRC=	${WRKDIR}/sigit-${PORTVERSION}
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${DATADIR} \
+		--bin-dir=${PREFIX}/bin \
+		--man-dir=${PREFIX}/man \
+		--etc-dir=${PREFIX}/etc
 
-MAN1=	sigit.1 sigit.rc.1
+MAN1=	sigit.1 sigitdb.1
+MAN5=	sigit.rc.5
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/etc/sigit.rc,${PREFIX}/etc/sigit.rc,; \
-		s,/usr/share/sigit,${DATADIR},' ${WRKSRC}/config.h
+	@${MV} ${WRKSRC}/data/sigit.rc ${WRKSRC}/data/sigit.rc.dist
 
 post-install:
 	@(if [ ! -f ${PREFIX}/etc/sigit.rc ]; then \
diff --git a/mail/sigit/distinfo b/mail/sigit/distinfo
index 5ab6f5dfb2da..52f1fb439378 100644
--- a/mail/sigit/distinfo
+++ b/mail/sigit/distinfo
@@ -1,3 +1,3 @@
-MD5 (Sigit-0.1.0.tar.gz) = 2f668e76780746498d44b15b60549317
-SHA256 (Sigit-0.1.0.tar.gz) = 7346e896dedff863f24e57b76d1be8b1fdb89caf3f22262990228a9b9f08dbdb
-SIZE (Sigit-0.1.0.tar.gz) = 49790
+MD5 (Sigit-0.3.0.tar.gz) = 6cf32ff08467c21a06bb462c6397a7e0
+SHA256 (Sigit-0.3.0.tar.gz) = 1ad816a86fddaddb2d2891bddd30bb8d0296d71b28edf9c809942ed0b10bc1ab
+SIZE (Sigit-0.3.0.tar.gz) = 133414
diff --git a/mail/sigit/files/patch-Makefile b/mail/sigit/files/patch-Makefile
deleted file mode 100644
index f18132fdd54f..000000000000
--- a/mail/sigit/files/patch-Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.orig	Thu Mar 15 18:28:16 2001
-+++ Makefile	Sat Aug 18 21:03:35 2001
-@@ -6,23 +6,22 @@
- OS=$(shell uname -s)
- 
- # Compiler
--CC=gcc
-+CC?=gcc
- 
- # Install prefix Where the database and original file is placed.. 
- 
--PREFIX=/usr/share/sigit
- 
- # Installation directory -- where the binary will go
- 
--INSTALLDIR=/usr/bin
-+INSTALLDIR=${PREFIX}/bin
- 
- # Where the default sigit configuration will be
- 
--RCDIR=/etc
-+RCDIR=${PREFIX}/etc
- 
- # Where the systems man pages are placed.. 
- 
--MANDIR=/usr/share/man
-+MANDIR=${PREFIX}/man
- 
- # if you want to test something..
- 
-@@ -47,11 +46,11 @@
- endif
- 
- # Compiler flags
--CFLAGS= -Wall -O2 -D$(OS) $(FLAGS)
-+CFLAGS+= -Wall -D$(OS) $(FLAGS)
- 
- # This is needed for "make install"
- OWNER  = root
--GROUP  = root
-+GROUP  = wheel
- INSTALL  = /usr/bin/install -o $(OWNER) -g $(GROUP) 
- 
- 
-@@ -98,14 +97,14 @@
- 
- 
- install:
--	$(INSTALL) -d $(PREFIX)
-+	$(INSTALL) -d $(PREFIX)/share/sigit
- 	$(INSTALL) -d $(INSTALLDIR)
- 	$(INSTALL) -d $(RCDIR)
- 	$(INSTALL) -d $(MANDIR)/man1
- 	$(INSTALL) -m 555 $(EXE) $(INSTALLDIR)
--	$(INSTALL) -m 664 sigit.data $(PREFIX)
--	$(INSTALL) -m 664 sigit.sig $(PREFIX)
--	$(INSTALL) -m 664 sigit.rc $(RCDIR)
-+	$(INSTALL) -m 664 sigit.data $(PREFIX)/share/sigit
-+	$(INSTALL) -m 664 sigit.sig $(PREFIX)/share/sigit
-+	$(INSTALL) -m 664 sigit.rc $(RCDIR)/sigit.rc.dist
- 	$(INSTALL) -m 444 sigit.1 $(MANDIR)/man1
- 	$(INSTALL) -m 444 sigit.rc.1 $(MANDIR)/man1
diff --git a/mail/sigit/files/patch-configure b/mail/sigit/files/patch-configure
new file mode 100644
index 000000000000..c2dcc1bc1a93
--- /dev/null
+++ b/mail/sigit/files/patch-configure
@@ -0,0 +1,34 @@
+--- configure.orig	2003-07-28 19:47:51.000000000 +0200
++++ configure	2010-07-20 15:00:43.000000000 +0200
+@@ -1084,16 +1084,25 @@
+     echo $echo_front "Checking for POSIX threads... $echo_end" 1>&5
+ fi
+ cat <<EOF >__conftest.c
+-#include <unistd.h>
+ #include <pthread.h>
+-int count=0;
+-void *handle() { count++;}
+-int main() {
++#include <stdio.h>
++#define NUM_THREADS     5
++
++int count = 0;
++
++void *test_thread()
++{
++  count++;
++  pthread_exit(NULL);
++}
++
++int main (int argc, char *argv[])
++{
+   pthread_t thread;
+-  pthread_attr_t attr;
+-  pthread_create(&thread, &attr, handle, NULL);
++  pthread_create(&thread, NULL, test_thread, 0);
+   return 0;
+ }
++
+ EOF
+ 
+ if [ x"$PRELINK" = x ]; then
diff --git a/mail/sigit/files/patch-data-Makefile b/mail/sigit/files/patch-data-Makefile
new file mode 100644
index 000000000000..b7fe4bc840f2
--- /dev/null
+++ b/mail/sigit/files/patch-data-Makefile
@@ -0,0 +1,11 @@
+--- data/Makefile.orig	2010-07-18 20:52:04.000000000 +0200
++++ data/Makefile	2010-07-18 20:52:39.000000000 +0200
+@@ -18,7 +18,7 @@
+ 	$(INSTALL) -d $(INSTALLROOT)$(ETCDIR)
+ 	$(INSTALL) -m $(MANMODE) sigit.data $(INSTALLROOT)$(PREFIX)
+ 	$(INSTALL) -m $(MANMODE) sigit.sig $(INSTALLROOT)$(PREFIX)
+-	$(INSTALL) -m $(MANMODE) sigit.rc $(INSTALLROOT)$(ETCDIR)
++	$(INSTALL) -m $(MANMODE) sigit.rc.dist $(INSTALLROOT)$(ETCDIR)
+ 
+ # and a way to remove it again.
+ uninstall:
diff --git a/mail/sigit/files/patch-deamoninit.c b/mail/sigit/files/patch-deamoninit.c
deleted file mode 100644
index db1f823ed5fb..000000000000
--- a/mail/sigit/files/patch-deamoninit.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- deamoninit.c.orig	Wed Oct 31 10:19:57 2001
-+++ deamoninit.c	Wed Oct 31 10:22:35 2001
-@@ -113,13 +113,13 @@
-   logging(2, 1, 0, 0, 1, "[ERROR] : Segfault bugtrace started at address: 0x%.8X\n", &ptr);
-   logging(1, 1, 0, 0, 1, "Running as pid: %d, with uid: %d, recieving status: %d\n", 
- 	  &sig->si_pid, &sig->si_uid, &sig->si_status);
--  logging(1, 1, 0, 0, 1, "Consuming %d User time, and %d System time\n", 
--	  &sig->si_utime , &sig->si_stime);
-+  /* logging(1, 1, 0, 0, 1, "Consuming %d User time, and %d System time\n", 
-+	  &sig->si_utime , &sig->si_stime); */
-   logging(1, 1, 0, 0, 1, "Recovering from error code: %d\n", &sig->si_errno);
-   logging(1, 1, 0, 0, 1, "Caused at address: 0x%.8X\n", &sig->si_addr);
--  logging(1, 1, 0, 0, 1, "While mengeling with fd: %d\n", &sig->si_fd);
-+  /* logging(1, 1, 0, 0, 1, "While mengeling with fd: %d\n", &sig->si_fd); */
-   /* hope this 'si_band' can be used here.. */
--  logging(1, 1, 0, 0, 1, "(%score dumped)\n", WCOREDUMP(&sig->si_band) ?"" : "no ");
-+  /* logging(1, 1, 0, 0, 1, "(%score dumped)\n", WCOREDUMP(&sig->si_band) ?"" : "no "); */
-   /*logging(1, 1, 0, 0, 1, "");*/
- 
-   /* hmmm should be a check here, about the syslog, 
diff --git a/mail/sigit/pkg-plist b/mail/sigit/pkg-plist
index 8b705003f09f..cc72cb0eccc2 100644
--- a/mail/sigit/pkg-plist
+++ b/mail/sigit/pkg-plist
@@ -1,7 +1,8 @@
 bin/sigit
+bin/sigitdb
 @unexec if cmp -s %D/etc/sigit.rc.dist %D/etc/sigit.rc; then rm -f %D/etc/sigit.rc; fi
 etc/sigit.rc.dist
 @exec if [ ! -f %D/etc/sigit.rc ]; then cp %D/etc/%f %D/etc/sigit.rc; fi
-share/sigit/sigit.data
-share/sigit/sigit.sig
-@dirrm share/sigit
+%%DATADIR%%/sigit.data
+%%DATADIR%%/sigit.sig
+@dirrm %%DATADIR%%