sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

We do not need separate `pptp_callmgr' binary

Browse source 
since it is built directly into `pptp' binary.
This commit is contained in:
Ruslan Ermilov 2000-08-11 08:57:41 +00:00
parent 967e42d6d2
commit 1fa1dea593
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=31515
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
net/pptpclient/files/patch-aa
View file

@ -1,6 +1,6 @@
--- Makefile.orig Wed Feb 18 14:42:14 1998 --- Makefile.orig Thu Feb 19 00:42:14 1998
+++ Makefile Sat Jun 19 15:06:52 1999 +++ Makefile Fri Aug 11 11:40:08 2000
@@ -1,19 +1,30 @@ @@ -1,17 +1,21 @@
VERSION = 1.0.2 VERSION = 1.0.2
VERSION_DEFINE = '-DPPTP_LINUX_VERSION="${VERSION}"' VERSION_DEFINE = '-DPPTP_LINUX_VERSION="${VERSION}"'
@ -14,29 +14,28 @@
LIBS = LIBS =
LDFLAGS = LDFLAGS =
+RM = rm -f +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: +# This is the directory where pptp gets installed:
+PPTP_BINDIR = ${PREFIX}/sbin +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"' -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 += '-DPPPD_BINARY="/usr/sbin/ppp"' -DUSER_PPP
################################################################# #################################################################
+CFLAGS += '-DPPTP_CALLMGR_BINARY="$(CALLMGR_BINDIR)/$(CALLMGR_BIN)"'
+
PPTP_BIN = pptp PPTP_BIN = pptp
PPTP_OBJS = pptp.o pptp_gre.o ppp_fcs.o pty.o \ @@ -24,7 +28,7 @@
pptp_ctrl.o dirutil.o vector.o \ CALLMGR_OBJS = pptp_callmgr.o pptp_ctrl.o dirutil.o util.o vector.o version.o
@@ -34,6 +45,12 @@ 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 vector_test: vector_test.o vector.o
$(CC) -o vector_test vector_test.o vector.o $(CC) -o vector_test vector_test.o vector.o
@ -44,8 +43,6 @@
+install: all +install: all
+ test -d $(PPTP_BINDIR) || mkdir -p $(PPTP_BINDIR) + test -d $(PPTP_BINDIR) || mkdir -p $(PPTP_BINDIR)
+ install -c -s -o root -g wheel -m 755 $(PPTP_BIN) $(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: clean:
$(RM) *.o *~ $(RM) *.o *~

1
net/pptpclient/pkg-plist
View file

@ -1,4 +1,3 @@
libexec/pptp_callmgr
sbin/pptp sbin/pptp
share/examples/pptpclient/README share/examples/pptpclient/README
share/examples/pptpclient/ppp.conf share/examples/pptpclient/ppp.conf