aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2000-08-11 16:57:41 +0800
committerru <ru@FreeBSD.org>2000-08-11 16:57:41 +0800
commit9d7bc730ea2bbace617a4814900441200c678efe (patch)
tree7ca3c6a75b393f75135242ee2c6849fe95017b47
parentc4ebb3783add3c1e78a6c2ef298d515b3de2477b (diff)
downloadfreebsd-ports-gnome-9d7bc730ea2bbace617a4814900441200c678efe.tar.gz
freebsd-ports-gnome-9d7bc730ea2bbace617a4814900441200c678efe.tar.zst
freebsd-ports-gnome-9d7bc730ea2bbace617a4814900441200c678efe.zip
We do not need separate `pptp_callmgr' binary
since it is built directly into `pptp' binary.
-rw-r--r--net/pptpclient/files/patch-aa37
-rw-r--r--net/pptpclient/pkg-plist1
2 files changed, 17 insertions, 21 deletions
diff --git a/net/pptpclient/files/patch-aa b/net/pptpclient/files/patch-aa
index d826f142e01f..aebd3ce6146c 100644
--- a/net/pptpclient/files/patch-aa
+++ b/net/pptpclient/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Feb 18 14:42:14 1998
-+++ Makefile Sat Jun 19 15:06:52 1999
-@@ -1,19 +1,30 @@
+--- Makefile.orig Thu Feb 19 00:42:14 1998
++++ Makefile Fri Aug 11 11:40:08 2000
+@@ -1,17 +1,21 @@
VERSION = 1.0.2
VERSION_DEFINE = '-DPPTP_LINUX_VERSION="${VERSION}"'
@@ -14,29 +14,28 @@
LIBS =
LDFLAGS =
+RM = rm -f
-
- #################################################################
--# CHANGE THIS LINE to point to the location of your pppd binary.
-+# CHANGE THESE LINES to change where programs are installed.
-+#################################################################
++
+# This is the directory where pptp gets installed:
+PPTP_BINDIR = ${PREFIX}/sbin
-+
-+# This is the directory where pptp_callmgr gets installed:
-+CALLMGR_BINDIR = ${PREFIX}/libexec
+
+ #################################################################
+ # CHANGE THIS LINE to point to the location of your pppd binary.
-CFLAGS += '-DPPPD_BINARY="/usr/sbin/pppd"'
-+# This is the pathname of your pppd binary:
-+#CFLAGS += '-DPPPD_BINARY="/usr/sbin/pppd"'
+CFLAGS += '-DPPPD_BINARY="/usr/sbin/ppp"' -DUSER_PPP
#################################################################
-+CFLAGS += '-DPPTP_CALLMGR_BINARY="$(CALLMGR_BINDIR)/$(CALLMGR_BIN)"'
-+
PPTP_BIN = pptp
- PPTP_OBJS = pptp.o pptp_gre.o ppp_fcs.o pty.o \
- pptp_ctrl.o dirutil.o vector.o \
-@@ -34,6 +45,12 @@
+@@ -24,7 +28,7 @@
+ CALLMGR_OBJS = pptp_callmgr.o pptp_ctrl.o dirutil.o util.o vector.o version.o
+ CALLMGR_DEPS = pptp_callmgr.h pptp_ctrl.h dirutil.h pptp_msg.h vector.h
+
+-all: $(PPTP_BIN) $(CALLMGR_BIN)
++all: $(PPTP_BIN)
+
+ $(PPTP_BIN): $(PPTP_OBJS) $(PPTP_DEPS)
+ $(CC) -o $(PPTP_BIN) $(PPTP_OBJS) $(LDFLAGS) $(LIBS)
+@@ -34,6 +38,10 @@
vector_test: vector_test.o vector.o
$(CC) -o vector_test vector_test.o vector.o
@@ -44,8 +43,6 @@
+install: all
+ test -d $(PPTP_BINDIR) || mkdir -p $(PPTP_BINDIR)
+ install -c -s -o root -g wheel -m 755 $(PPTP_BIN) $(PPTP_BINDIR)
-+ test -d $(CALLMGR_BINDIR) || mkdir -p $(CALLMGR_BINDIR)
-+ install -c -s -o root -g wheel -m 755 $(CALLMGR_BIN) $(CALLMGR_BINDIR)
clean:
$(RM) *.o *~
diff --git a/net/pptpclient/pkg-plist b/net/pptpclient/pkg-plist
index 5fe173c06c64..ba089bbd2ea2 100644
--- a/net/pptpclient/pkg-plist
+++ b/net/pptpclient/pkg-plist
@@ -1,4 +1,3 @@
-libexec/pptp_callmgr
sbin/pptp
share/examples/pptpclient/README
share/examples/pptpclient/ppp.conf