View | Details | Raw Unified | Return to bug 87891
Collapse All | Expand All

(-)/usr/ports/net/poptop-new/Makefile (-8 / +22 lines)
Lines 1-22 Link Here
1
# New ports collection makefile for:	poptop
1
# New ports collection makefile for:	poptop
2
# Date created:		04 October 1999
2
# Date created:		20 October 2005
3
# Whom:			Nick Sayer <nsayer@freebsd.org>
3
# Whom:			Oleg Golovanov <olmi@rentech.ru>
4
#
4
#
5
# $FreeBSD: ports/net/poptop/Makefile,v 1.20 2004/02/04 05:08:18 marcus Exp $
5
# $FreeBSD: ports/net/poptop/Makefile,v 1.20 2005/10/20 05:08:18 olmi Exp $
6
#
6
#
7
7
8
PORTNAME=	poptop
8
PORTNAME=	poptop
9
PORTVERSION=	1.1.4.b4
9
PORTVERSION=	1.2.1
10
PORTREVISION=	3
10
PORTREVISION=	9
11
CATEGORIES=	net
11
CATEGORIES=	net
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	http://jaist.dl.sourceforge.net/sourceforge/poptop/ \
13
		http://easynews.dl.sourceforge.net/sourceforge/poptop/ \
14
		http://nchc.dl.sourceforge.net/sourceforge/poptop/ \
15
		http://optusnet.dl.sourceforge.net/sourceforge/poptop/ \
16
		http://mesh.dl.sourceforge.net/sourceforge/poptop/ \
17
		http://switch.dl.sourceforge.net/sourceforge/poptop/ \
18
		http://kent.dl.sourceforge.net/sourceforge/poptop/ \
19
		http://puzzle.dl.sourceforge.net/sourceforge/poptop/ \
20
		http://cogent.dl.sourceforge.net/sourceforge/poptop/ \
21
		http://citkit.dl.sourceforge.net/sourceforge/poptop/ \
22
		http://belnet.dl.sourceforge.net/sourceforge/poptop/ \
23
		${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
24
MASTER_SITE_SUBDIR=	${PORTNAME}
14
DISTNAME=	pptpd-${PORTVERSION:S/.b/-b/}
25
DISTNAME=	pptpd-${PORTVERSION:S/.b/-b/}
15
26
16
MAINTAINER=	ports@FreeBSD.org
27
MAINTAINER=	olmi@rentech.ru
17
COMMENT=	Windows 9x compatible PPTP (VPN) server
28
COMMENT=	Windows 9x compatible PPTP (VPN) server
18
29
19
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
30
#WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
31
WRKSRC=                ${WRKDIR}/pptpd-${PORTVERSION}
32
33
20
34
21
USE_GETOPT_LONG=	yes
35
USE_GETOPT_LONG=	yes
22
USE_REINPLACE=	yes
36
USE_REINPLACE=	yes
(-)/usr/ports/net/poptop-new/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (pptpd-1.1.4-b4.tar.gz) = 58603224998f22542e8d7ecb357bc006
1
MD5 (pptpd-1.2.1.tar.gz) = 067e9474998345485ba1e92cc5ff59c6
2
SIZE (pptpd-1.1.4-b4.tar.gz) = 157684
2
SIZE (pptpd-1.2.1.tar.gz) = 180974
(-)/usr/ports/net/poptop-new/files/patch-aa (-17 / +11 lines)
Lines 1-17 Link Here
1
--- defaults.h.orig	Thu Mar  7 19:09:42 2002
1
--- configure.in.orig	Wed Jun 23 07:38:43 2004
2
+++ defaults.h	Sun Sep  8 10:19:58 2002
2
+++ configure.in	Thu Oct 20 22:33:48 2005
3
@@ -40,10 +40,14 @@
3
@@ -112,7 +112,7 @@
4
 #endif
4
 if test "$ac_cv_header_libintl_h" = yes; then
5
 
5
   if test "$ac_cv_lib_c_gettext" = no; then
6
 #define PPP_SPEED_DEFAULT		"115200"
6
     if test "$ac_cv_lib_intl_gettext" = yes; then
7
+#ifdef __FreeBSD__
7
-      XTRALIBS_MGR = "$XTRALIBS_MGR -lintl"
8
+#define PPTPD_CONFIG_FILE_DEFAULT	ETCDIR "/pptpd.conf"
8
+      XTRALIBS_MGR="$XTRALIBS_MGR -lintl"
9
+#else
9
     else
10
 #if EMBED
10
       echo "Have libintl.h but no usable gettext!" 1>&2
11
 #define PPTPD_CONFIG_FILE_DEFAULT	"/etc/config/pptpd.conf"
11
       exit 1
12
 #else
13
 #define PPTPD_CONFIG_FILE_DEFAULT	"/etc/pptpd.conf"
14
+#endif
15
 #endif
16
 #define PIDFILE_DEFAULT			"/var/run/pptpd.pid"
17
 
(-)/usr/ports/net/poptop-new/files/patch-ab (-33 / +353 lines)
Lines 1-35 Link Here
1
1
--- configure.orig	Wed Jun 23 07:39:15 2004
2
$FreeBSD: ports/net/poptop/files/patch-ab,v 1.5 2003/10/18 18:22:42 krion Exp $
2
+++ configure	Thu Oct 20 22:33:48 2005
3
3
@@ -958,7 +958,7 @@
4
--- Makefile.in.orig	Fri Feb 28 00:41:21 2003
4
     else
5
+++ Makefile.in	Sat Oct 18 21:51:01 2003
5
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
6
@@ -75,7 +75,7 @@
6
     fi
7
 AUTOMAKE_OPTIONS = no-dependencies foreign
7
-    cd "$ac_popdir"
8
+    cd $ac_popdir
9
   done
10
 fi
8
 
11
 
9
 INCLUDES = -I.
12
@@ -2301,7 +2301,8 @@
10
-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
13
   cat conftest.err >&5
11
+CFLAGS= @CFLAGS@ -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
14
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
12
 #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
15
   (exit $ac_status); } &&
13
 #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
16
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
17
+	 { ac_try='test -z "$ac_c_werror_flag"
18
+			 || test ! -s conftest.err'
19
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20
   (eval $ac_try) 2>&5
21
   ac_status=$?
22
@@ -2359,7 +2360,8 @@
23
   cat conftest.err >&5
24
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
25
   (exit $ac_status); } &&
26
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
27
+	 { ac_try='test -z "$ac_c_werror_flag"
28
+			 || test ! -s conftest.err'
29
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
30
   (eval $ac_try) 2>&5
31
   ac_status=$?
32
@@ -2475,7 +2477,8 @@
33
   cat conftest.err >&5
34
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
35
   (exit $ac_status); } &&
36
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
37
+	 { ac_try='test -z "$ac_c_werror_flag"
38
+			 || test ! -s conftest.err'
39
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
40
   (eval $ac_try) 2>&5
41
   ac_status=$?
42
@@ -2529,7 +2532,8 @@
43
   cat conftest.err >&5
44
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
45
   (exit $ac_status); } &&
46
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
47
+	 { ac_try='test -z "$ac_c_werror_flag"
48
+			 || test ! -s conftest.err'
49
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
50
   (eval $ac_try) 2>&5
51
   ac_status=$?
52
@@ -2574,7 +2578,8 @@
53
   cat conftest.err >&5
54
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
55
   (exit $ac_status); } &&
56
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
57
+	 { ac_try='test -z "$ac_c_werror_flag"
58
+			 || test ! -s conftest.err'
59
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
60
   (eval $ac_try) 2>&5
61
   ac_status=$?
62
@@ -2618,7 +2623,8 @@
63
   cat conftest.err >&5
64
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
65
   (exit $ac_status); } &&
66
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
67
+	 { ac_try='test -z "$ac_c_werror_flag"
68
+			 || test ! -s conftest.err'
69
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
70
   (eval $ac_try) 2>&5
71
   ac_status=$?
72
@@ -3107,7 +3113,8 @@
73
   cat conftest.err >&5
74
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
75
   (exit $ac_status); } &&
76
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
77
+	 { ac_try='test -z "$ac_c_werror_flag"
78
+			 || test ! -s conftest.err'
79
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
80
   (eval $ac_try) 2>&5
81
   ac_status=$?
82
@@ -3167,7 +3174,8 @@
83
   cat conftest.err >&5
84
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
85
   (exit $ac_status); } &&
86
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
87
+	 { ac_try='test -z "$ac_c_werror_flag"
88
+			 || test ! -s conftest.err'
89
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
90
   (eval $ac_try) 2>&5
91
   ac_status=$?
92
@@ -3309,7 +3317,8 @@
93
   cat conftest.err >&5
94
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
95
   (exit $ac_status); } &&
96
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
97
+	 { ac_try='test -z "$ac_c_werror_flag"
98
+			 || test ! -s conftest.err'
99
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
100
   (eval $ac_try) 2>&5
101
   ac_status=$?
102
@@ -3625,7 +3634,8 @@
103
   cat conftest.err >&5
104
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
105
   (exit $ac_status); } &&
106
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
107
+	 { ac_try='test -z "$ac_c_werror_flag"
108
+			 || test ! -s conftest.err'
109
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
110
   (eval $ac_try) 2>&5
111
   ac_status=$?
112
@@ -3795,7 +3805,8 @@
113
   cat conftest.err >&5
114
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
115
   (exit $ac_status); } &&
116
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
117
+	 { ac_try='test -z "$ac_c_werror_flag"
118
+			 || test ! -s conftest.err'
119
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
120
   (eval $ac_try) 2>&5
121
   ac_status=$?
122
@@ -3862,7 +3873,8 @@
123
   cat conftest.err >&5
124
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
125
   (exit $ac_status); } &&
126
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
127
+	 { ac_try='test -z "$ac_c_werror_flag"
128
+			 || test ! -s conftest.err'
129
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
130
   (eval $ac_try) 2>&5
131
   ac_status=$?
132
@@ -4011,7 +4023,8 @@
133
   cat conftest.err >&5
134
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
135
   (exit $ac_status); } &&
136
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
137
+	 { ac_try='test -z "$ac_c_werror_flag"
138
+			 || test ! -s conftest.err'
139
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
140
   (eval $ac_try) 2>&5
141
   ac_status=$?
142
@@ -4160,7 +4173,8 @@
143
   cat conftest.err >&5
144
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
145
   (exit $ac_status); } &&
146
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
147
+	 { ac_try='test -z "$ac_c_werror_flag"
148
+			 || test ! -s conftest.err'
149
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
150
   (eval $ac_try) 2>&5
151
   ac_status=$?
152
@@ -4309,7 +4323,8 @@
153
   cat conftest.err >&5
154
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
155
   (exit $ac_status); } &&
156
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
157
+	 { ac_try='test -z "$ac_c_werror_flag"
158
+			 || test ! -s conftest.err'
159
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
160
   (eval $ac_try) 2>&5
161
   ac_status=$?
162
@@ -4458,7 +4473,8 @@
163
   cat conftest.err >&5
164
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
165
   (exit $ac_status); } &&
166
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
167
+	 { ac_try='test -z "$ac_c_werror_flag"
168
+			 || test ! -s conftest.err'
169
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
170
   (eval $ac_try) 2>&5
171
   ac_status=$?
172
@@ -4606,7 +4622,8 @@
173
   cat conftest.err >&5
174
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
175
   (exit $ac_status); } &&
176
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
177
+	 { ac_try='test -z "$ac_c_werror_flag"
178
+			 || test ! -s conftest.err'
179
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
180
   (eval $ac_try) 2>&5
181
   ac_status=$?
182
@@ -4671,7 +4688,8 @@
183
   cat conftest.err >&5
184
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
185
   (exit $ac_status); } &&
186
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
187
+	 { ac_try='test -z "$ac_c_werror_flag"
188
+			 || test ! -s conftest.err'
189
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
190
   (eval $ac_try) 2>&5
191
   ac_status=$?
192
@@ -4736,7 +4754,8 @@
193
   cat conftest.err >&5
194
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
195
   (exit $ac_status); } &&
196
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
197
+	 { ac_try='test -z "$ac_c_werror_flag"
198
+			 || test ! -s conftest.err'
199
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
200
   (eval $ac_try) 2>&5
201
   ac_status=$?
202
@@ -4801,7 +4820,8 @@
203
   cat conftest.err >&5
204
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
205
   (exit $ac_status); } &&
206
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
207
+	 { ac_try='test -z "$ac_c_werror_flag"
208
+			 || test ! -s conftest.err'
209
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
210
   (eval $ac_try) 2>&5
211
   ac_status=$?
212
@@ -4866,7 +4886,8 @@
213
   cat conftest.err >&5
214
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
215
   (exit $ac_status); } &&
216
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
217
+	 { ac_try='test -z "$ac_c_werror_flag"
218
+			 || test ! -s conftest.err'
219
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
220
   (eval $ac_try) 2>&5
221
   ac_status=$?
222
@@ -4971,7 +4992,8 @@
223
   cat conftest.err >&5
224
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
225
   (exit $ac_status); } &&
226
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
227
+	 { ac_try='test -z "$ac_c_werror_flag"
228
+			 || test ! -s conftest.err'
229
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
230
   (eval $ac_try) 2>&5
231
   ac_status=$?
232
@@ -5024,7 +5046,8 @@
233
   cat conftest.err >&5
234
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
235
   (exit $ac_status); } &&
236
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
237
+	 { ac_try='test -z "$ac_c_werror_flag"
238
+			 || test ! -s conftest.err'
239
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
240
   (eval $ac_try) 2>&5
241
   ac_status=$?
242
@@ -5101,7 +5124,8 @@
243
   cat conftest.err >&5
244
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
245
   (exit $ac_status); } &&
246
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
247
+	 { ac_try='test -z "$ac_c_werror_flag"
248
+			 || test ! -s conftest.err'
249
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
250
   (eval $ac_try) 2>&5
251
   ac_status=$?
252
@@ -5174,7 +5198,8 @@
253
   cat conftest.err >&5
254
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
255
   (exit $ac_status); } &&
256
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
257
+	 { ac_try='test -z "$ac_c_werror_flag"
258
+			 || test ! -s conftest.err'
259
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
260
   (eval $ac_try) 2>&5
261
   ac_status=$?
262
@@ -5247,7 +5272,8 @@
263
   cat conftest.err >&5
264
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
265
   (exit $ac_status); } &&
266
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
267
+	 { ac_try='test -z "$ac_c_werror_flag"
268
+			 || test ! -s conftest.err'
269
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
270
   (eval $ac_try) 2>&5
271
   ac_status=$?
272
@@ -5320,7 +5346,8 @@
273
   cat conftest.err >&5
274
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
275
   (exit $ac_status); } &&
276
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
277
+	 { ac_try='test -z "$ac_c_werror_flag"
278
+			 || test ! -s conftest.err'
279
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
280
   (eval $ac_try) 2>&5
281
   ac_status=$?
282
@@ -5393,7 +5420,8 @@
283
   cat conftest.err >&5
284
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
285
   (exit $ac_status); } &&
286
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
287
+	 { ac_try='test -z "$ac_c_werror_flag"
288
+			 || test ! -s conftest.err'
289
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
290
   (eval $ac_try) 2>&5
291
   ac_status=$?
292
@@ -5466,7 +5494,8 @@
293
   cat conftest.err >&5
294
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
295
   (exit $ac_status); } &&
296
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
297
+	 { ac_try='test -z "$ac_c_werror_flag"
298
+			 || test ! -s conftest.err'
299
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
300
   (eval $ac_try) 2>&5
301
   ac_status=$?
302
@@ -5539,7 +5568,8 @@
303
   cat conftest.err >&5
304
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
305
   (exit $ac_status); } &&
306
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
307
+	 { ac_try='test -z "$ac_c_werror_flag"
308
+			 || test ! -s conftest.err'
309
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
310
   (eval $ac_try) 2>&5
311
   ac_status=$?
312
@@ -5612,7 +5642,8 @@
313
   cat conftest.err >&5
314
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
315
   (exit $ac_status); } &&
316
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
317
+	 { ac_try='test -z "$ac_c_werror_flag"
318
+			 || test ! -s conftest.err'
319
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
320
   (eval $ac_try) 2>&5
321
   ac_status=$?
322
@@ -5683,7 +5714,7 @@
323
 if test "$ac_cv_header_libintl_h" = yes; then
324
   if test "$ac_cv_lib_c_gettext" = no; then
325
     if test "$ac_cv_lib_intl_gettext" = yes; then
326
-      XTRALIBS_MGR = "$XTRALIBS_MGR -lintl"
327
+      XTRALIBS_MGR="$XTRALIBS_MGR -lintl"
328
     else
329
       echo "Have libintl.h but no usable gettext!" 1>&2
330
       exit 1
331
@@ -6712,6 +6743,11 @@
332
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
333
   esac
14
 
334
 
15
@@ -93,8 +93,8 @@
335
+  if test x"$ac_file" != x-; then
16
 # for dependencies, so just attribute them all to pptpd.
336
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
17
 
337
+echo "$as_me: creating $ac_file" >&6;}
18
 pptpd_SOURCES = \
338
+    rm -f "$ac_file"
19
-	pptpd.c configfile.c pptpmanager.c compat.c inststr.c getopt.c getopt1.c \
339
+  fi
20
-	compat.h configfile.h ctrlpacket.h defaults.h inststr.h our_getopt.h \
340
   # Let's still pretend it is `configure' which instantiates (i.e., don't
21
+	pptpd.c configfile.c pptpmanager.c compat.c inststr.c \
341
   # use $as_me), people would be surprised to read:
22
+	compat.h configfile.h ctrlpacket.h defaults.h inststr.h out_getopt.h \
342
   #    /* config.h.  Generated by config.status.  */
23
 	our_syslog.h ppphdlc.h pptpctrl.h pptpdefs.h pptpgre.h pptpmanager.h
343
@@ -6750,12 +6786,6 @@
24
 
344
 	 fi;;
25
 
345
       esac
26
@@ -118,8 +118,7 @@
346
     done` || { (exit 1); exit 1; }
27
 LDFLAGS = @LDFLAGS@
347
-
28
 LIBS = @LIBS@
348
-  if test x"$ac_file" != x-; then
29
 pptpd_OBJECTS =  pptpd.$(OBJEXT) configfile.$(OBJEXT) \
349
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
30
-pptpmanager.$(OBJEXT) compat.$(OBJEXT) inststr.$(OBJEXT) \
350
-echo "$as_me: creating $ac_file" >&6;}
31
-getopt.$(OBJEXT) getopt1.$(OBJEXT)
351
-    rm -f "$ac_file"
32
+pptpmanager.$(OBJEXT) compat.$(OBJEXT) inststr.$(OBJEXT)
352
-  fi
33
 pptpd_DEPENDENCIES = 
353
 _ACEOF
34
 pptpd_LDFLAGS = 
354
 cat >>$CONFIG_STATUS <<_ACEOF
35
 pptpctrl_OBJECTS =  pptpctrl.$(OBJEXT) ctrlpacket.$(OBJEXT) \
355
   sed "$ac_vpsub
(-)/usr/ports/net/poptop-new/files/patch-ac (+11 lines)
Line 0 Link Here
1
--- pptpctrl.c.orig	Wed Apr 28 11:36:07 2004
2
+++ pptpctrl.c	Thu Oct 20 22:33:48 2005
3
@@ -734,7 +734,7 @@
4
 
5
         if (pptp_logwtmp) {
6
                  pppd_argv[an++] = "plugin";
7
-                 pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
8
+                 pppd_argv[an++] = "@@PREFIX@@/lib/pptpd/pptpd-logwtmp.so";
9
                  pppd_argv[an++] = "pptpd-original-ip";
10
                  pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
11
         }
(-)/usr/ports/net/poptop-new/files/patch-ad (-37 / +9 lines)
Lines 1-39 Link Here
1
--- pptpd.c.orig	Thu Feb 27 04:01:10 2003
1
--- Makefile.am.orig	Wed Jun 23 09:48:50 2004
2
+++ pptpd.c	Sat May  3 18:02:26 2003
2
+++ Makefile.am	Thu Oct 20 22:33:48 2005
3
@@ -82,24 +82,23 @@
3
@@ -32,7 +32,7 @@
4
 static void showusage(char *prog)
4
 debian/po/templates.pot
5
 {
6
 	printf("\nPoPToP v%s\n", VERSION);
7
-	printf("The PPTP Server for Linux\n");
8
+	printf("The PPTP Server for FreeBSD\n");
9
 	printf("Usage: pptpd [options], where options are:\n\n");
10
 #ifdef BCRELAY
11
 	printf(" [-b] [--bcrelay if]       Use broadcast relay for broadcasts comming from.\n");
12
 	printf("                           the specified interface (default is eth1).\n");
13
 #endif
14
 	printf(" [-c] [--conf file]        Specifies the config file to read default\n");
15
-	printf("                           settings from (default is /etc/pptpd.conf).\n");
16
+	printf("                           settings from (default is " PPTPD_CONFIG_FILE_DEFAULT ").\n");
17
 	printf(" [-d] [--debug]            Turns on debugging (to syslog).\n");
18
 	printf(" [-f] [--fg]               Run in foreground.\n");
19
 	printf(" [-h] [--help]             Displays this help message.\n");
20
 	printf(" [-l] [--listen x.x.x.x]   Specifies IP of local interface to listen to.\n");
21
 #if !defined(BSDUSER_PPP)
22
 	printf(" [-o] [--option file]      Specifies the PPP options file to use\n");
23
-	printf("                           (default is /etc/ppp/options).\n");
24
 #endif
25
 	printf(" [-p] [--pidfile file]     Specifies the file to write the process ID to\n");
26
-	printf("                           (default is /var/run/pptpd.pid).\n");
27
+	printf("                           (default is "PIDFILE_DEFAULT").\n");
28
 #if !defined(BSDUSER_PPP)
29
 	printf(" [-s] [--speed baud]       Specifies the baud speed for the PPP daemon\n");
30
 	printf("                           (default is 115200).\n");
31
@@ -111,7 +110,7 @@
32
 	printf("\n\nLogs and debugging go to syslog as DAEMON.");
33
 
34
 	printf("\n\nCommand line options will override any default settings and any settings\n");
35
-	printf("specified in the config file (default config file: /etc/pptpd.conf).\n\n");
36
+	printf("specified in the config file.\n\n");
37
 }
38
 
5
 
6
 EXTRA_PROGRAMS = 
7
-sbin_PROGRAMS = pptpd pptpctrl bcrelay
8
+sbin_PROGRAMS = pptpd pptpctrl
39
 
9
 
10
 # Header files are only used to determine what to put in a distribution, not
11
 # for dependencies, so just attribute them all to pptpd.
(-)/usr/ports/net/poptop-new/files/patch-ae (-13 / +51 lines)
Lines 1-13 Link Here
1
--- pptpctrl.c.orig     Sat May  3 18:09:16 2003
1
--- Makefile.in.orig	Wed Jun 23 10:03:07 2004
2
+++ pptpctrl.c  Sat May  3 18:09:28 2003
2
+++ Makefile.in	Thu Oct 20 22:33:48 2005
3
@@ -26,9 +26,9 @@
3
@@ -14,7 +14,7 @@
4
 #include <time.h>
4
 
5
 #include <sys/time.h>
5
 @SET_MAKE@
6
 #include <dirent.h>
6
 
7
+#include <sys/socket.h>
7
-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
8
 #include <net/if.h>
8
+SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
9
 #include <sys/types.h>
9
 
10
-#include <sys/socket.h>
10
 srcdir = @srcdir@
11
 #include <netinet/in.h>
11
 top_srcdir = @top_srcdir@
12
 #include <arpa/inet.h>
12
@@ -37,7 +37,7 @@
13
 #ifdef HAVE_OPENPTY
13
 PRE_UNINSTALL = :
14
 POST_UNINSTALL = :
15
 EXTRA_PROGRAMS =
16
-sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT) bcrelay$(EXEEXT)
17
+sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT)
18
 subdir = .
19
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
20
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
21
@@ -55,9 +55,6 @@
22
 am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
23
 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
24
 PROGRAMS = $(sbin_PROGRAMS)
25
-am_bcrelay_OBJECTS = bcrelay.$(OBJEXT)
26
-bcrelay_OBJECTS = $(am_bcrelay_OBJECTS)
27
-bcrelay_LDADD = $(LDADD)
28
 am_pptpctrl_OBJECTS = pptpctrl.$(OBJEXT) ctrlpacket.$(OBJEXT) \
29
 	inststr.$(OBJEXT) compat.$(OBJEXT) pptpgre.$(OBJEXT) \
30
 	ppphdlc.$(OBJEXT)
31
@@ -76,8 +73,8 @@
32
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
33
 CCLD = $(CC)
34
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
35
-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
36
-DIST_SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
37
+SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
38
+DIST_SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
39
 man5dir = $(mandir)/man5
40
 man8dir = $(mandir)/man8
41
 NROFF = nroff
42
@@ -285,9 +282,6 @@
43
 
44
 clean-sbinPROGRAMS:
45
 	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
46
-bcrelay$(EXEEXT): $(bcrelay_OBJECTS) $(bcrelay_DEPENDENCIES) 
47
-	@rm -f bcrelay$(EXEEXT)
48
-	$(LINK) $(bcrelay_LDFLAGS) $(bcrelay_OBJECTS) $(bcrelay_LDADD) $(LIBS)
49
 pptpctrl$(EXEEXT): $(pptpctrl_OBJECTS) $(pptpctrl_DEPENDENCIES) 
50
 	@rm -f pptpctrl$(EXEEXT)
51
 	$(LINK) $(pptpctrl_LDFLAGS) $(pptpctrl_OBJECTS) $(pptpctrl_LDADD) $(LIBS)
(-)/usr/ports/net/poptop-new/files/patch-af (+11 lines)
Line 0 Link Here
1
--- pptpd.8.orig	Mon May 24 09:39:03 2004
2
+++ pptpd.8	Thu Oct 20 22:33:48 2005
3
@@ -29,7 +29,7 @@
4
 specifies the configuration file for
5
 .B pptpd
6
 (default
7
-.IR /etc/pptpd.conf )
8
+.IR /usr/local/etc/pptpd.conf )
9
 
10
 .TP
11
 .BR -d | --debug
(-)/usr/ports/net/poptop-new/files/patch-ag (+11 lines)
Line 0 Link Here
1
--- defaults.h.orig	Wed Apr 28 11:36:07 2004
2
+++ defaults.h	Thu Oct 20 22:33:48 2005
3
@@ -45,7 +45,7 @@
4
 #if EMBED
5
 #define PPTPD_CONFIG_FILE_DEFAULT	"/etc/config/pptpd.conf"
6
 #else
7
-#define PPTPD_CONFIG_FILE_DEFAULT	"/etc/pptpd.conf"
8
+#define PPTPD_CONFIG_FILE_DEFAULT	"/usr/local/etc/pptpd.conf"
9
 #endif
10
 #define PIDFILE_DEFAULT			"/var/run/pptpd.pid"
11
 
(-)/usr/ports/net/poptop-new/files/patch-ah (+11 lines)
Line 0 Link Here
1
--- pptpd.conf.5.orig	Mon May 24 09:31:24 2004
2
+++ pptpd.conf.5	Thu Oct 20 22:33:48 2005
3
@@ -5,7 +5,7 @@
4
 .SH DESCRIPTION
5
 .BR pptpd (8)
6
 reads options from this file, usually
7
-.IR /etc/pptpd.conf .
8
+.IR /usr/local/etc/pptpd.conf .
9
 Most options can be overridden by the command line.  The local and
10
 remote IP addresses for clients must come from the configuration file
11
 or from

Return to bug 87891