diff options
Diffstat (limited to '')
| -rw-r--r-- | net/poptop/Makefile | 51 | ||||
| -rw-r--r-- | net/poptop/files/patch-ab | 25 |
2 files changed, 52 insertions, 24 deletions
diff --git a/net/poptop/Makefile b/net/poptop/Makefile index a102c297db03..82df248069b7 100644 --- a/net/poptop/Makefile +++ b/net/poptop/Makefile @@ -5,30 +5,37 @@ # $FreeBSD$ # -PORTNAME= poptop -PORTVERSION= 1.1.4.b4 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= poptop -DISTNAME= pptpd-${PORTVERSION:S/.b/-b/} - -MAINTAINER= ports@FreeBSD.org -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 +PORTNAME= poptop +PORTVERSION= 1.1.4.b4 +PORTREVISION= 1 +CATEGORIES= net +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} +DISTNAME= pptpd-${PORTVERSION:S/.b/-b/} + +MAINTAINER= ports@FreeBSD.org +COMMENT= Windows 9x compatible PPTP (VPN) server + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} -MAN5= pptpd.conf.5 -MAN8= pptpd.8 pptpctrl.8 +USE_GETOPT_LONG= yes +USE_REINPLACE= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ + AUTOHEADER="${TRUE}" \ + +MAN5= pptpd.conf.5 +MAN8= pptpd.8 pptpctrl.8 + +.ifdef(WITH_KERNPPP) +CONFIGURE_ARGS+= --with-bsdppp +.endif -# fix broken timestamps that trigger autotools hell -pre-patch: - @cd ${WRKSRC}; ${TOUCH} aclocal.m4 Makefile.in stamp-h.in +post-patch: +.for file in bcrelay.c pptpd.c + @${REINPLACE_CMD} -e 's|"out_getopt\.h"|<getopt.h>|g' ${WRKSRC}/${file} +.endfor post-install: ${INSTALL_DATA} ${WRKSRC}/samples/pptpd.conf \ diff --git a/net/poptop/files/patch-ab b/net/poptop/files/patch-ab index 61ee35c674c8..61166519a849 100644 --- a/net/poptop/files/patch-ab +++ b/net/poptop/files/patch-ab @@ -1,8 +1,8 @@ $FreeBSD$ ---- Makefile.in.orig Thu Feb 27 16:41:21 2003 -+++ Makefile.in Wed Jun 25 01:35:11 2003 +--- Makefile.in.orig Fri Feb 28 00:41:21 2003 ++++ Makefile.in Sat Oct 18 21:51:01 2003 @@ -75,7 +75,7 @@ AUTOMAKE_OPTIONS = no-dependencies foreign @@ -12,3 +12,24 @@ $FreeBSD$ #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"' +@@ -93,8 +93,8 @@ + # for dependencies, so just attribute them all to pptpd. + + pptpd_SOURCES = \ +- pptpd.c configfile.c pptpmanager.c compat.c inststr.c getopt.c getopt1.c \ +- compat.h configfile.h ctrlpacket.h defaults.h inststr.h our_getopt.h \ ++ pptpd.c configfile.c pptpmanager.c compat.c inststr.c \ ++ compat.h configfile.h ctrlpacket.h defaults.h inststr.h out_getopt.h \ + our_syslog.h ppphdlc.h pptpctrl.h pptpdefs.h pptpgre.h pptpmanager.h + + +@@ -118,8 +118,7 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + pptpd_OBJECTS = pptpd.$(OBJEXT) configfile.$(OBJEXT) \ +-pptpmanager.$(OBJEXT) compat.$(OBJEXT) inststr.$(OBJEXT) \ +-getopt.$(OBJEXT) getopt1.$(OBJEXT) ++pptpmanager.$(OBJEXT) compat.$(OBJEXT) inststr.$(OBJEXT) + pptpd_DEPENDENCIES = + pptpd_LDFLAGS = + pptpctrl_OBJECTS = pptpctrl.$(OBJEXT) ctrlpacket.$(OBJEXT) \ |