diff options
| author | ehaupt <ehaupt@FreeBSD.org> | 2008-11-28 06:36:52 +0800 |
|---|---|---|
| committer | ehaupt <ehaupt@FreeBSD.org> | 2008-11-28 06:36:52 +0800 |
| commit | 541a84a6128d7cb9fae3ced794475116d34d746a (patch) | |
| tree | 7b3b4b55998b7f53662591d31cb70762308247b2 /net | |
| parent | 2aa6750216fcebfc61ae181642c69bcf648d1974 (diff) | |
| download | freebsd-ports-gnome-541a84a6128d7cb9fae3ced794475116d34d746a.tar.gz freebsd-ports-gnome-541a84a6128d7cb9fae3ced794475116d34d746a.tar.zst freebsd-ports-gnome-541a84a6128d7cb9fae3ced794475116d34d746a.zip | |
- Fix a segmentation fault
- Bump PORTREVISION
- Respect CC and CFLAGS
PR: 129042
Submitted by: zlopi.ru <zlopi.ru@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/poptop/Makefile | 4 | ||||
| -rw-r--r-- | net/poptop/files/patch-plugins_Makefile | 16 | ||||
| -rw-r--r-- | net/poptop/files/patch-pptpd.c | 6 |
3 files changed, 21 insertions, 5 deletions
diff --git a/net/poptop/Makefile b/net/poptop/Makefile index 4777c945ddac..1755b7335f21 100644 --- a/net/poptop/Makefile +++ b/net/poptop/Makefile @@ -7,7 +7,7 @@ PORTNAME= poptop PORTVERSION= 1.3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,9 +18,9 @@ COMMENT= Windows 9x compatible PPTP (VPN) server USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" +MAKE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" USE_RC_SUBR= pptpd.sh diff --git a/net/poptop/files/patch-plugins_Makefile b/net/poptop/files/patch-plugins_Makefile new file mode 100644 index 000000000000..1fcd6e5f89a5 --- /dev/null +++ b/net/poptop/files/patch-plugins_Makefile @@ -0,0 +1,16 @@ +--- plugins/Makefile.orig 2006-08-03 04:02:01.000000000 +0200 ++++ plugins/Makefile 2008-11-27 22:19:48.000000000 +0100 +@@ -1,10 +1,10 @@ +-CC = gcc +-COPTS = -O2 -g ++CC ?= gcc ++CPP ?= $(CXX) + CFLAGS = $(COPTS) -I.. -I../../include -fPIC + LDFLAGS = -shared + LDADD = -lutil + INSTALL = install -o root +-prefix = /usr/local ++prefix = $(PREFIX) + + PLUGINS = pptpd-logwtmp.so + diff --git a/net/poptop/files/patch-pptpd.c b/net/poptop/files/patch-pptpd.c index c45f48c77063..9bf3035505fc 100644 --- a/net/poptop/files/patch-pptpd.c +++ b/net/poptop/files/patch-pptpd.c @@ -1,5 +1,5 @@ ---- pptpd.c.orig Tue Sep 5 01:17:25 2006 -+++ pptpd.c Tue Jul 31 08:19:38 2007 +--- pptpd.c.orig 2006-09-05 01:17:25.000000000 +0200 ++++ pptpd.c 2008-11-27 22:09:53.000000000 +0100 @@ -98,18 +98,21 @@ printf(" [-i] [--noipparam] Suppress the passing of the client's IP address\n"); printf(" to PPP, which is done by default otherwise.\n"); @@ -22,7 +22,7 @@ #endif printf(" [-t] [--stimeout seconds] Specifies the timeout for the first packet. This is a DOS protection\n"); - printf(" (default is 10).\n"); -+ printf(" (default is %s).\n",STIMEOUT_DEFAULT); ++ printf(" (default is %d).\n",STIMEOUT_DEFAULT); printf(" [-v] [--version] Displays the pptpd version number.\n"); printf(" [-w] [--logwtmp] Update wtmp as users login.\n"); printf(" [-C] [--connections n] Limit on number of connections.\n"); |