Date: Sun, 19 Oct 2003 01:45:54 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58224: Update port: net/poptop Message-ID: <20031019014554.3d840588.tkato@prontomail.com> Resent-Message-ID: <200310181700.h9IH0cHk094389@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58224 >Category: ports >Synopsis: Update port: net/poptop >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 18 10:00:38 PDT 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.8-RELEASE-p13 i386 >Organization: >Environment: >Description: - Fix build on -current >How-To-Repeat: >Fix: diff -urN /usr/ports/net/poptop/Makefile net/poptop/Makefile --- /usr/ports/net/poptop/Makefile Wed Jul 30 19:01:07 2003 +++ net/poptop/Makefile Sat Oct 18 21:54:37 2003 @@ -5,30 +5,37 @@ # $FreeBSD: ports/net/poptop/Makefile,v 1.17 2003/07/30 08:26:37 krion Exp $ # -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 -urN /usr/ports/net/poptop/files/patch-ab net/poptop/files/patch-ab --- /usr/ports/net/poptop/files/patch-ab Wed Jun 25 21:10:37 2003 +++ net/poptop/files/patch-ab Sat Oct 18 21:55:45 2003 @@ -1,8 +1,8 @@ $FreeBSD: ports/net/poptop/files/patch-ab,v 1.4 2003/06/24 23:39:42 naddy Exp $ ---- 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 @@ #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) \ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031019014554.3d840588.tkato>