Date: Mon, 13 Jan 2014 03:20:13 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185711: net/pptpclient: Update to version 1.8.0 Message-ID: <20140113032013.286fcbf3abcbc57a86079ee4@yahoo.com> Resent-Message-ID: <201401121840.s0CIe8Dj049496@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185711
>Category: ports
>Synopsis: net/pptpclient: Update to version 1.8.0
>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: Sun Jan 12 18:40:08 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Update to version 1.8.0
Remove file:
files/patch-aa
files/patch-ac
files/patch-pptp_compat.c
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net/pptpclient/Makefile net/pptpclient/Makefile
--- /usr/ports/net/pptpclient/Makefile 2013-11-06 21:53:14.000000000 +0900
+++ net/pptpclient/Makefile 2014-01-13 00:00:00.000000000 +0900
@@ -2,8 +2,7 @@
# $FreeBSD: head/net/pptpclient/Makefile 327755 2013-09-20 22:10:23Z bapt $
PORTNAME= pptpclient
-PORTVERSION= 1.7.2
-PORTREVISION= 6
+PORTVERSION= 1.8.0
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/pptp/pptp-${PORTVERSION}
DISTNAME= pptp-${PORTVERSION}
@@ -11,19 +10,22 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= PPTP client for establishing a VPN link with an NT server
-LICENSE= GPLv2
+LICENSE= GPLv2 # (or later)
USES= perl5
-MAKE_ARGS= DEBUG="" CC="${CC}"
+MAKE_ARGS= CC="${CC}" OPTIMIZE="${CFLAGS}" DEBUG="" PPPD="/usr/sbin/ppp"
-MAN8= pptp.8
+CFLAGS+= -DUSER_PPP
+
+PORTEXAMPLES= README ppp.conf
+PLIST_FILES= sbin/pptp man/man8/pptp.8.gz
-NO_STAGE= yes
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/pptp ${PREFIX}/sbin
- @${MKDIR} ${PREFIX}/share/examples/pptpclient
- ${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples/pptpclient
- ${INSTALL_DATA} ${FILESDIR}/ppp.conf ${PREFIX}/share/examples/pptpclient
- ${INSTALL_MAN} ${WRKSRC}/pptp.8 ${PREFIX}/man/man8
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} pptp ${STAGEDIR}${PREFIX}/sbin)
+ (cd ${WRKSRC} && ${INSTALL_MAN} pptp.8 ${STAGEDIR}${MANPREFIX}/man/man8)
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+.for ex in ${PORTEXAMPLES}
+ (cd ${FILESDIR} && ${INSTALL_DATA} ${ex} ${STAGEDIR}${EXAMPLESDIR})
+.endfor
.include <bsd.port.mk>
diff -urN /usr/ports/net/pptpclient/distinfo net/pptpclient/distinfo
--- /usr/ports/net/pptpclient/distinfo 2013-11-06 21:53:14.000000000 +0900
+++ net/pptpclient/distinfo 2014-01-13 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (pptp-1.7.2.tar.gz) = e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc
-SIZE (pptp-1.7.2.tar.gz) = 81113
+SHA256 (pptp-1.8.0.tar.gz) = e39c42d933242a8a6dd8600a0fa7f0a5ec8f066d10c4149d8e81a5c68fe4bbda
+SIZE (pptp-1.8.0.tar.gz) = 86778
diff -urN /usr/ports/net/pptpclient/files/patch-aa net/pptpclient/files/patch-aa
--- /usr/ports/net/pptpclient/files/patch-aa 2013-11-06 21:53:14.000000000 +0900
+++ net/pptpclient/files/patch-aa 1970-01-01 09:00:00.000000000 +0900
@@ -1,20 +0,0 @@
---- Makefile.orig 2008-05-14 11:33:55.000000000 +0500
-+++ Makefile 2013-08-29 11:28:02.675336240 +0400
-@@ -4,7 +4,7 @@ RELEASE=
-
- #################################################################
- # CHANGE THIS LINE to point to the location of your pppd binary.
--PPPD = /usr/sbin/pppd
-+PPPD = /usr/sbin/ppp
- #################################################################
-
- BINDIR=$(DESTDIR)/usr/sbin
-@@ -16,7 +16,7 @@ RM = rm -f
- OPTIMIZE= -O0
- DEBUG = -g
- INCLUDE =
--CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE)
-+CFLAGS += -Wall $(DEBUG) $(INCLUDE) -DUSER_PPP
- LIBS = -lutil
- # Solaris 10
- # LIBS = -lnsl -lsocket -lresolv
diff -urN /usr/ports/net/pptpclient/files/patch-ac net/pptpclient/files/patch-ac
--- /usr/ports/net/pptpclient/files/patch-ac 2013-11-06 21:53:14.000000000 +0900
+++ net/pptpclient/files/patch-ac 1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
-RCS file: /home/jdp/f5/pptp/cvs/pptp/pptp_callmgr.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- pptp_callmgr.h 1999/04/28 19:36:57 1.1.1.1
-+++ pptp_callmgr.h 1999/04/28 19:43:06 1.2
-@@ -6,4 +6,7 @@
- */
-
- #define PPTP_SOCKET_PREFIX "/var/run/pptp/"
-+
-+#ifndef PPTP_CALLMGR_BINARY
- #define PPTP_CALLMGR_BINARY "./pptp_callmgr"
-+#endif
diff -urN /usr/ports/net/pptpclient/files/patch-pptp_compat.c net/pptpclient/files/patch-pptp_compat.c
--- /usr/ports/net/pptpclient/files/patch-pptp_compat.c 2013-11-06 21:53:14.000000000 +0900
+++ net/pptpclient/files/patch-pptp_compat.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- pptp_compat.c.orig 2008-05-19 03:44:02.000000000 +0800
-+++ pptp_compat.c 2008-05-19 03:44:45.000000000 +0800
-@@ -7,7 +7,7 @@
- #include <fcntl.h>
- #include <sys/types.h>
- #include <unistd.h>
--#include <stropts.h>
-+#include <sys/un.h>
- #include <stdlib.h>
- #include <strings.h>
- #include "pptp_compat.h"
diff -urN /usr/ports/net/pptpclient/pkg-plist net/pptpclient/pkg-plist
--- /usr/ports/net/pptpclient/pkg-plist 2013-11-06 21:53:14.000000000 +0900
+++ net/pptpclient/pkg-plist 1970-01-01 09:00:00.000000000 +0900
@@ -1,4 +0,0 @@
-sbin/pptp
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/ppp.conf
-@dirrm %%EXAMPLESDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140113032013.286fcbf3abcbc57a86079ee4>