diff options
author | Pete Fritchman <petef@FreeBSD.org> | 2003-05-11 15:13:52 +0000 |
---|---|---|
committer | Pete Fritchman <petef@FreeBSD.org> | 2003-05-11 15:13:52 +0000 |
commit | b7f4a984eca1e447fb02d3464da1c82c844505a2 (patch) | |
tree | f1acd82e2e23ca110cd4250caf697d06662f7a70 /net/poptop | |
parent | Add pflogstats 20030404, postfix Log Statistics Reporter. (diff) |
- update to 1.1.4.b3
While I'm here,
- spell ports@FreeBSD.org correctly
- portlint'ify: move WRKSRC to it's proper section
PR: 51736
Submitted by: Matthew D. Fuller <fullermd@over-yonder.net>
Notes
Notes:
svn path=/head/; revision=80672
Diffstat (limited to 'net/poptop')
-rw-r--r-- | net/poptop/Makefile | 9 | ||||
-rw-r--r-- | net/poptop/distinfo | 2 | ||||
-rw-r--r-- | net/poptop/files/patch-ab | 10 | ||||
-rw-r--r-- | net/poptop/files/patch-ac | 10 | ||||
-rw-r--r-- | net/poptop/files/patch-ad | 12 | ||||
-rw-r--r-- | net/poptop/files/patch-ae | 13 | ||||
-rw-r--r-- | net/poptop/files/patch-af | 21 |
7 files changed, 36 insertions, 41 deletions
diff --git a/net/poptop/Makefile b/net/poptop/Makefile index fcfb356ee837..7a3f0254a0ea 100644 --- a/net/poptop/Makefile +++ b/net/poptop/Makefile @@ -6,24 +6,23 @@ # PORTNAME= poptop -PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTVERSION= 1.1.4.b3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= poptop -DISTNAME= pptpd-${PORTVERSION} +DISTNAME= pptpd-${PORTVERSION:S/.b/-b/} -MAINTAINER= ports@freebsd.org +MAINTAINER= ports@FreeBSD.org COMMENT= Windows 9x compatible PPTP (VPN) server GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-bsdppp +WRKSRC= ${WRKDIR}/${PORTNAME}-1.1.4 MAN5= pptpd.conf.5 MAN8= pptpd.8 pptpctrl.8 pre-patch: - ${RM} ${WRKSRC}/config.cache ${CP} ${WRKSRC}/our_getopt.h ${WRKSRC}/getopt.h post-install: diff --git a/net/poptop/distinfo b/net/poptop/distinfo index 5f86e62c13e5..692c01596750 100644 --- a/net/poptop/distinfo +++ b/net/poptop/distinfo @@ -1 +1 @@ -MD5 (pptpd-1.1.3.tar.gz) = 1f2d75829883a375b43abcc3e39dcf62 +MD5 (pptpd-1.1.4-b3.tar.gz) = 4dd39d55beef23d4d3948a7df844bbbe diff --git a/net/poptop/files/patch-ab b/net/poptop/files/patch-ab index 179caee4998e..a470af757529 100644 --- a/net/poptop/files/patch-ab +++ b/net/poptop/files/patch-ab @@ -1,11 +1,11 @@ ---- Makefile.in.orig Tue Oct 5 19:26:04 1999 -+++ Makefile.in Tue Oct 5 19:26:21 1999 -@@ -74,7 +74,7 @@ +--- Makefile.in.orig Sat May 3 17:54:08 2003 ++++ Makefile.in Sat May 3 17:55:08 2003 +@@ -75,7 +75,7 @@ AUTOMAKE_OPTIONS = no-dependencies foreign INCLUDES = -I. --CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' +-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' +CFLAGS+= -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' + #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"' - man_MANS = pptpctrl.8 pptpd.8 pptpd.conf.5 diff --git a/net/poptop/files/patch-ac b/net/poptop/files/patch-ac index 25211fa05c14..b8afbd1d8efb 100644 --- a/net/poptop/files/patch-ac +++ b/net/poptop/files/patch-ac @@ -1,11 +1,11 @@ ---- Makefile.am.orig Wed Sep 22 17:01:28 1999 -+++ Makefile.am Tue Oct 5 19:25:56 1999 +--- Makefile.am.orig Sat May 3 17:55:55 2003 ++++ Makefile.am Sat May 3 17:56:22 2003 @@ -11,7 +11,7 @@ ## warning with -Wmissing-prototypes). ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers ## aren't up to it). --CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -+CFLAGS= ${CFLAGS} -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' +-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' ++CFLAGS = ${CFLAGS} -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' + #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"' - man_MANS = pptpctrl.8 pptpd.8 pptpd.conf.5 diff --git a/net/poptop/files/patch-ad b/net/poptop/files/patch-ad index 0d9b3fb36650..bb267c4d0919 100644 --- a/net/poptop/files/patch-ad +++ b/net/poptop/files/patch-ad @@ -1,12 +1,16 @@ ---- pptpd.c.orig Wed Sep 22 17:01:28 1999 -+++ pptpd.c Tue Oct 5 19:32:07 1999 -@@ -77,20 +77,19 @@ +--- pptpd.c.orig Thu Feb 27 04:01:10 2003 ++++ pptpd.c Sat May 3 18:02:26 2003 +@@ -82,24 +82,23 @@ static void showusage(char *prog) { printf("\nPoPToP v%s\n", VERSION); - printf("The PPTP Server for Linux\n"); + printf("The PPTP Server for FreeBSD\n"); printf("Usage: pptpd [options], where options are:\n\n"); + #ifdef BCRELAY + printf(" [-b] [--bcrelay if] Use broadcast relay for broadcasts comming from.\n"); + printf(" the specified interface (default is eth1).\n"); + #endif printf(" [-c] [--conf file] Specifies the config file to read default\n"); - printf(" settings from (default is /etc/pptpd.conf).\n"); + printf(" settings from (default is " PPTPD_CONFIG_FILE_DEFAULT ").\n"); @@ -24,7 +28,7 @@ #if !defined(BSDUSER_PPP) printf(" [-s] [--speed baud] Specifies the baud speed for the PPP daemon\n"); printf(" (default is 115200).\n"); -@@ -100,7 +99,7 @@ +@@ -111,7 +110,7 @@ printf("\n\nLogs and debugging go to syslog as DAEMON."); printf("\n\nCommand line options will override any default settings and any settings\n"); diff --git a/net/poptop/files/patch-ae b/net/poptop/files/patch-ae new file mode 100644 index 000000000000..7d77fbbeb523 --- /dev/null +++ b/net/poptop/files/patch-ae @@ -0,0 +1,13 @@ +--- pptpctrl.c.orig Sat May 3 18:09:16 2003 ++++ pptpctrl.c Sat May 3 18:09:28 2003 +@@ -26,9 +26,9 @@ + #include <time.h> + #include <sys/time.h> + #include <dirent.h> ++#include <sys/socket.h> + #include <net/if.h> + #include <sys/types.h> +-#include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #ifdef HAVE_OPENPTY diff --git a/net/poptop/files/patch-af b/net/poptop/files/patch-af deleted file mode 100644 index a5a4ddbde183..000000000000 --- a/net/poptop/files/patch-af +++ /dev/null @@ -1,21 +0,0 @@ ---- pptpmanager.c.orig Sun Sep 8 10:35:53 2002 -+++ pptpmanager.c Sun Sep 8 10:36:05 2002 -@@ -72,15 +72,15 @@ - char pppLocal[16]; - }; - --/* option for timeout on starting ctrl connection */ --int pptp_stimeout = STIMEOUT_DEFAULT; -- - /* global for signal handler */ - static struct callArray clientArray[MAX_CONNECTIONS]; - - /* from IP parser */ - extern int maxConnections; - #endif -+ -+/* option for timeout on starting ctrl connection */ -+int pptp_stimeout = STIMEOUT_DEFAULT; - - /* local function prototypes */ - static void connectCall(int clientSocket, int clientNumber); |