From 2e1476e133656d91e18a8631532d20eee82477f7 Mon Sep 17 00:00:00 2001
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Wed, 25 Jun 2003 01:04:56 +0000
Subject: * Fix autotools chaos. * Add option for kernel ppp support.
Adapted from
PR: 53544
Submitted by: Sergey Akifyev <asa@gascom.ru>
---
net/poptop/Makefile | 9 +++++++--
net/poptop/files/patch-ac | 14 --------------
2 files changed, 7 insertions(+), 16 deletions(-)
delete mode 100644 net/poptop/files/patch-ac
(limited to 'net/poptop')
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index 7a3f0254a0ea..f497eb2ba888 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -13,17 +13,22 @@ MASTER_SITE_SUBDIR= poptop
DISTNAME= pptpd-${PORTVERSION:S/.b/-b/}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Windows 9x compatible PPTP (VPN) server
+COMMENT= Windows 9x compatible PPTP (VPN) server
GNU_CONFIGURE= yes
+.ifdef(POPTOP_KERNPPP)
+CONFIGURE_ARGS=
+.else
CONFIGURE_ARGS= --with-bsdppp
+.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-1.1.4
MAN5= pptpd.conf.5
MAN8= pptpd.8 pptpctrl.8
+# fix broken timestamps that trigger autotools hell
pre-patch:
- ${CP} ${WRKSRC}/our_getopt.h ${WRKSRC}/getopt.h
+ @cd ${WRKSRC}; touch aclocal.m4 Makefile.in stamp-h.in
post-install:
${INSTALL_DATA} ${WRKSRC}/samples/pptpd.conf \
diff --git a/net/poptop/files/patch-ac b/net/poptop/files/patch-ac
deleted file mode 100644
index a07f21eb17b9..000000000000
--- a/net/poptop/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.am.orig Thu Feb 27 16:41:20 2003
-+++ Makefile.am Wed Jun 25 01:34: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 -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)"'
-
--
cgit v1.2.3