ports/53544: [patch] net/poptop does not install + more issues

[Sergey Akifyev]

>Number:         53544
>Category:       ports
>Synopsis:       [patch] net/poptop does not install + more issues
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 20 01:50:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Akifyev
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
JSC Gascom
>Environment:
System: FreeBSD asa.gascom.net.ru 4.8-RELEASE FreeBSD 4.8-RELEASE #5: Fri May 16 11:18:03 MSD 2003 asa at boulder.gascom.ru:/usr/src/sys/compile/ASA i386

>Description:
1) poptop port does not install because of incorrect patch, which
adds recursive variable in Makefile

2) this port is suffering from double build: first when you type 'make',
second when you type 'make install'

3) poptop lacks option for compiling with kernel ppp support

P.S. I tried to contact maintainer with this about 2 month ago, but he didn't
respond, so please commit this due to timeout. Also, please close my previous
PR about poptop, as this is more complete solution of problem.
(PR = http://www.freebsd.org/cgi/query-pr.cgi?pr=53135)
>How-To-Repeat:
# cd /usr/ports/net/poptop
# make install
Variable CFLAGS is recursive.
*** Error code 2
 
Stop in /usr/ports/net/poptop.
>Fix:
Above patch fixes all these issues

diff -ruN poptop.orig/Makefile poptop/Makefile
--- poptop.orig/Makefile	Fri Jun 20 12:19:43 2003
+++ poptop/Makefile	Fri Jun 20 12:22:42 2003
@@ -16,8 +16,13 @@
 COMMENT=	Windows 9x compatible PPTP (VPN) server
 
 GNU_CONFIGURE=		yes
+.ifdef(POPTOP_KERNPPP)
+CONFIGURE_ARGS=
+.else
 CONFIGURE_ARGS=		--with-bsdppp
+.endif
 WRKSRC=			${WRKDIR}/${PORTNAME}-1.1.4
+MAKE_ENV=		BSDCFLAGS="${CFLAGS}"
 
 MAN5=			pptpd.conf.5
 MAN8=			pptpd.8 pptpctrl.8
diff -ruN poptop.orig/files/patch-ab poptop/files/patch-ab
--- poptop.orig/files/patch-ab	Fri Jun 20 12:19:43 2003
+++ poptop/files/patch-ab	Fri Jun 20 12:32:48 2003
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat May  3 17:54:08 2003
-+++ Makefile.in	Sat May  3 17:55:08 2003
+--- 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
  
@@ -9,3 +9,12 @@
  #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)
diff -ruN poptop.orig/files/patch-ac poptop/files/patch-ac
--- poptop.orig/files/patch-ac	Fri Jun 20 12:19:43 2003
+++ poptop/files/patch-ac	Fri Jun 20 12:19:58 2003
@@ -5,7 +5,7 @@
  ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
  ##  aren't up to it).
 -CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
-+CFLAGS = ${CFLAGS} -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
++CFLAGS = ${BSDCFLAGS} -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
  #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
  #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
  
>Release-Note:
>Audit-Trail:
>Unformatted: