- Downgrade to version 1.05 at the express request of the author. The 1.1x

  code tree is, in the author's opinion, not even ready for a -devel port.
- Bumped PORTEPOCH because of the above.
- Make SPOOLDIR a variable which may be altered by the user at install time.

Submitted by:	Mark Tranchant <mark@tranchant.freeserve.co.uk>

5 files changed, 28 insertions, 29 deletions

diff --git a/ftp/ftpq/Makefile b/ftp/ftpq/Makefile
index 88dd2c2e38ed..b9d94da85d61 100644
--- a/ftp/ftpq/Makefile
+++ b/ftp/ftpq/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	ftpq
-PORTVERSION=	1.10
+PORTVERSION=	1.05
+PORTEPOCH=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.tranchant.freeserve.co.uk/software/
 
@@ -15,9 +16,14 @@ MAINTAINER=	ports@FreeBSD.org
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAN1=		ftpq.1
+SPOOLDIR?=	/var/spool/ftpq
+PLIST_SUB+=	SPOOLDIR=${SPOOLDIR}
+
+post-patch:
+	@ ${PERL} -pi -e 's#%%SPOOLDIR%%#${SPOOLDIR}#' \
+	  ${WRKSRC}/Makefile.in ${WRKSRC}/src/ftpq.h
 
 post-install:
-	@${MKDIR} /var/spool/ftpq
-	@${CHMOD} 777 /var/spool/ftpq
+	@ ${MKDIR} ${SPOOLDIR} && ${CHMOD} 777 ${SPOOLDIR}
 
 .include <bsd.port.mk>
diff --git a/ftp/ftpq/distinfo b/ftp/ftpq/distinfo
index 59fffd080223..2e1ce9144376 100644
--- a/ftp/ftpq/distinfo
+++ b/ftp/ftpq/distinfo
@@ -1 +1 @@
-MD5 (ftpq-1.10.tar.gz) = e30e485d732fa50d7a3f361586af00f6
+MD5 (ftpq-1.05.tar.gz) = b2b9ca612b5236e1bf7ea42e072c1594
diff --git a/ftp/ftpq/files/patch-Makefile.in b/ftp/ftpq/files/patch-Makefile.in
new file mode 100644
index 000000000000..ffd1b2b26cff
--- /dev/null
+++ b/ftp/ftpq/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Sep  4 13:00:00 2001
++++ Makefile.in	Wed Sep  5 15:01:12 2001
+@@ -6,7 +6,7 @@
+ 
+ # Spool directory. Also hard-coded into the executable.
+ # See ftpq.h.
+-SPOOLDIR = /tmp/ftpq/
++SPOOLDIR = %%SPOOLDIR%%
+ 
+ # Program name
+ PROG = ftpq
diff --git a/ftp/ftpq/files/patch-src:ftpq.h b/ftp/ftpq/files/patch-src:ftpq.h
index bc6dd347a378..68ec0716f379 100644
--- a/ftp/ftpq/files/patch-src:ftpq.h
+++ b/ftp/ftpq/files/patch-src:ftpq.h
@@ -1,29 +1,11 @@
---- src/ftpq.h.orig	Fri Jul 27 16:56:05 2001
-+++ src/ftpq.h	Sat Jul 28 09:15:43 2001
-@@ -20,6 +20,9 @@
- 
- /* includes */
- #include "../config.h"
-+#ifdef HAVE_SYS_TYPES_H
-+	#include <sys/types.h>
-+#endif
- #ifdef HAVE_CTYPE_H
- 	#include <ctype.h>
- #endif
-@@ -56,15 +59,12 @@
- #ifdef HAVE_SYS_TIME_H
- 	#include <sys/time.h>
- #endif
--#ifdef HAVE_SYS_TYPES_H
--	#include <sys/types.h>
--#endif
- #ifdef HAVE_UNISTD_H
- 	#include <unistd.h>
- #endif
+--- src/ftpq.h.orig	Tue Sep  4 13:00:00 2001
++++ src/ftpq.h	Wed Sep  5 15:02:03 2001
+@@ -35,7 +35,7 @@
+ #include <pwd.h>
  
  /* useful defined constants */
 -#define SPOOLDIR    "/tmp/ftpq/"   /* must end in /. Check Makefile, too. */
-+#define SPOOLDIR    "/var/spool/ftpq/"   /* must end in /. Check Makefile, too. */
++#define SPOOLDIR    "%%SPOOLDIR%%/"/* must end in /. Check Makefile, too. */
  #define HOSTRESP    2048           /* ftp server response buffer, bytes */
  #define BUFSIZE     2048           /* general purpose global buffer */
  #define SMTP_PORT     25
diff --git a/ftp/ftpq/pkg-plist b/ftp/ftpq/pkg-plist
index 0130e819dda0..303edce80e35 100644
--- a/ftp/ftpq/pkg-plist
+++ b/ftp/ftpq/pkg-plist
@@ -1,3 +1,3 @@
 bin/ftpq
-@exec mkdir -p /var/spool/ftpq
-@unexec rmdir /var/spool/ftpq 2>/dev/null || true
+@exec mkdir -p %%SPOOLDIR%%
+@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true