Attachment #32398 for bug #53544

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

Lines 16-23 Link Here

(-)poptop/Makefile (+5 lines)
16	COMMENT= Windows 9x compatible PPTP (VPN) server	16	COMMENT= Windows 9x compatible PPTP (VPN) server
17		17
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
		19	.ifdef(POPTOP_KERNPPP)
		20	CONFIGURE_ARGS=
		21	.else
19	CONFIGURE_ARGS= --with-bsdppp	22	CONFIGURE_ARGS= --with-bsdppp
		23	.endif
20	WRKSRC= ${WRKDIR}/${PORTNAME}-1.1.4	24	WRKSRC= ${WRKDIR}/${PORTNAME}-1.1.4
		25	MAKE_ENV= BSDCFLAGS="${CFLAGS}"
21		26
22	MAN5= pptpd.conf.5	27	MAN5= pptpd.conf.5
23	MAN8= pptpd.8 pptpctrl.8	28	MAN8= pptpd.8 pptpctrl.8




--- Makefile.in.orig	Thu Feb 27 18:41:21 2003
+++ Makefile.in	Fri Jun 20 12:32:28 2003
@@ -75,7 +75,7 @@
 AUTOMAKE_OPTIONS = no-dependencies foreign
 

 #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
 #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
 
@@ -153,8 +153,6 @@
 	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4):  configure.in 
 	cd $(srcdir) && $(ACLOCAL)

Lines 5-11 Link Here

(-)poptop/files/patch-ac (-1 / +1 lines)
5	## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers	5	## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
6	## aren't up to it).	6	## aren't up to it).
7	-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'	7	-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
8	+CFLAGS = ${CFLAGS} -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'	8	+CFLAGS = ${BSDCFLAGS} -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
9	#CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'	9	#CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
10	#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'	10	#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'

Return to bug 53544

Lines 1-5 Link Here

(-)poptop/files/patch-ab (-2 / +11 lines)
1	--- Makefile.in.orig Sat May 3 17:54:08 2003	1	--- Makefile.in.orig Thu Feb 27 18:41:21 2003
2	+++ Makefile.in Sat May 3 17:55:08 2003	2	+++ Makefile.in Fri Jun 20 12:32:28 2003
3	@@ -75,7 +75,7 @@	3	@@ -75,7 +75,7 @@
4	AUTOMAKE_OPTIONS = no-dependencies foreign	4	AUTOMAKE_OPTIONS = no-dependencies foreign
5		5
Lines 9-11 Link Here
9	#CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'	9	#CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
10	#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'	10	#CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
11		11
		12	@@ -153,8 +153,6 @@
		13	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
		14
		15	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
		16	- cd $(top_builddir) \
		17	- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
		18
		19	$(ACLOCAL_M4): configure.in
		20	cd $(srcdir) && $(ACLOCAL)