- Update to 1.1

- Fix build on FreeBSD 4.X

PR:		ports/97935
Submitted by:	Shaun Amott <shaun@inerd.com> (maintainer)

5 files changed, 54 insertions, 12 deletions

diff --git a/www/quickie/Makefile b/www/quickie/Makefile
index 29feba4f092b..64de1c75ad52 100644
--- a/www/quickie/Makefile
+++ b/www/quickie/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	quickie
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	www
 MASTER_SITES=	http://${PORTNAME}.sourceforge.net/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -20,6 +20,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}		\
 		--sysconfdir=${PREFIX}/etc	\
 		--localstatedir=${DATADIR}
 
+USE_GETOPT_LONG=	yes
+
 MAN1=		quickie-config.1 quickie_prime.1 quickie.1 quickie_svt.1 \
 		quickie_license.1 quickie_post_install.1
 
@@ -38,13 +40,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 .include <bsd.port.pre.mk>
 
-.if (${OSVERSION} < 500041)
-BROKEN=		does not compile on 4.x; needs a newer libc
-.endif
-
 post-patch:
 	@${CP} ${FILESDIR}/freebsd.h ${WRKSRC}/lib
-	@${REINPLACE_CMD} -e 's#var/[^ ]*\.man##g' ${WRKSRC}/Makefile.in
 
 pre-install:
 	@${MKDIR} ${DATADIR}/admin
diff --git a/www/quickie/distinfo b/www/quickie/distinfo
index 724323032592..63bd57fc03cc 100644
--- a/www/quickie/distinfo
+++ b/www/quickie/distinfo
@@ -1,6 +1,6 @@
-MD5 (quickie-1.0.tar.gz) = 5dca1346dfbe034d8e43061763b9fb92
-SHA256 (quickie-1.0.tar.gz) = cdf17e935852f3e9d5b6928bea71e7acaf40f5b6df8779595927b13cea1eb93f
-SIZE (quickie-1.0.tar.gz) = 274016
-MD5 (quickie-1.0.pdf) = f9c2db25e11e0baf250d39bec0273e29
-SHA256 (quickie-1.0.pdf) = 2963b7cb55095f2970bcd9a1193bea31916f0ee219f64a9fb40fefb77a7873e4
-SIZE (quickie-1.0.pdf) = 110380
+MD5 (quickie-1.1.tar.gz) = 05d1c560d571c32fbb6b37ac9607b2c8
+SHA256 (quickie-1.1.tar.gz) = 268be3ad142a544b2ffa71416b04ba014fdcbd97562b26d0c6cd912b71daa6b2
+SIZE (quickie-1.1.tar.gz) = 278045
+MD5 (quickie-1.1.pdf) = c09ecedf4e04905ca44297983df99297
+SHA256 (quickie-1.1.pdf) = 806c84bb31b00573f15ce9897a1526f3b7e1451e0fe1d89b07bb582943660ee1
+SIZE (quickie-1.1.pdf) = 76778
diff --git a/www/quickie/files/patch-lib_arglex.cc b/www/quickie/files/patch-lib_arglex.cc
new file mode 100644
index 000000000000..5f7e54bf8798
--- /dev/null
+++ b/www/quickie/files/patch-lib_arglex.cc
@@ -0,0 +1,14 @@
+--- lib/arglex.cc.orig	Sat May 20 23:56:52 2006
++++ lib/arglex.cc	Thu May 25 12:36:38 2006
+@@ -21,6 +21,11 @@
+ 
+ #include <cctype>
+ 
++#ifdef __FreeBSD__
++#include <unistd.h>
++#include <stdio.h>
++#endif
++
+ #include <arglex.h>
+ #include <progname.h>
+ #include <quit.h>
diff --git a/www/quickie/files/patch-lib_quit.cc b/www/quickie/files/patch-lib_quit.cc
new file mode 100644
index 000000000000..4d7b30e3a3fa
--- /dev/null
+++ b/www/quickie/files/patch-lib_quit.cc
@@ -0,0 +1,14 @@
+--- lib/quit.cc.orig	Sat May 20 23:56:52 2006
++++ lib/quit.cc	Thu May 25 12:40:10 2006
+@@ -21,6 +21,11 @@
+ 
+ #pragma implementation "quit"
+ 
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/stat.h>
++#endif
++
+ #include <cerrno>
+ #include <cstdarg>
+ #include <cstdio>
diff --git a/www/quickie/files/patch-quickie-config_main.cc b/www/quickie/files/patch-quickie-config_main.cc
new file mode 100644
index 000000000000..f836c01ba79d
--- /dev/null
+++ b/www/quickie/files/patch-quickie-config_main.cc
@@ -0,0 +1,17 @@
+--- quickie-config/main.cc.orig	Sat May 20 23:56:52 2006
++++ quickie-config/main.cc	Thu May 25 12:57:25 2006
+@@ -24,7 +24,13 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <unistd.h>
+-#include <getopt.h>
++
++#ifdef __FreeBSD__
++//#  include <osreldate.h>
++//#  if __FreeBSD_version < 500041
++#    include <getopt.h>
++//#  endif
++#endif
+ 
+ #include <configuration.h>
+ #include <progname.h>