ports/110145: misc/zaptel 1.1 can't upgrade from previous version 1.0

[Anish Mistry]

>Number:         110145
>Category:       ports
>Synopsis:       misc/zaptel 1.1 can't upgrade from previous version 1.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 09 22:20:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Anish Mistry
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
AM Productions 
>Environment:


System: FreeBSD 6.2-RELEASE #0: Thu Feb  1 01:53:22 EST 2007
    amistry at bigguy.am-productions.biz:/usr/home/amistry/storage/temp/usr/home/amistry/windows-share/build/src/sys/BIGGUY



>Description:


You can't update zaptel to 1.1 if there is a previous version installed.

This is because the ${PREFIX} path is included before the local ones.  The old zaptel.h doesn't contain ZT_GET_PARAMS_RETURN_MASTER so the build fails.
cc -O2 -fno-strict-aliasing -pipe   -I/usr/local/include -I. -I../zaptel -DUSE_LOCAL_INCLUDE=1  -DPREFIX=\"/usr/local\" -o ztcfg.o -c ztcfg.c
ztcfg.c: In function `main':
ztcfg.c:865: error: `ZT_GET_PARAMS_RETURN_MASTER' undeclared (first use in this function)
ztcfg.c:865: error: (Each undeclared identifier is reported only once
ztcfg.c:865: error: for each function it appears in.)
*** Error code 1

Stop in /usr/ports/misc/zaptel/work/zaptel-bsd-1.1/ztcfg.
*** Error code 1

Stop in /usr/ports/misc/zaptel/work/zaptel-bsd-1.1.
*** Error code 1

Stop in /usr/ports/misc/zaptel.

You can compile that file properly by doing:
 cc -O2 -fno-strict-aliasing -pipe -I. -I../zaptel -I/usr/local/include -DUSE_LOCAL_INCLUDE=1  -DPREFIX=\"/usr/local\" -o ztcfg.o -c ztcfg.c


>How-To-Repeat:


Try to build zaptel-1.1 with zaptel-1.0 installed.


>Fix:


--- zaptel-1.1-update-fix.patch begins here ---
diff -ruN zaptel.orig/Makefile zaptel/Makefile
--- zaptel.orig/Makefile	Fri Mar  9 16:18:19 2007
+++ zaptel/Makefile	Fri Mar  9 16:24:51 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	zaptel
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.pbxpress.com/~gonzo/
 DISTNAME=	${PORTNAME}-bsd-${PORTVERSION}
diff -ruN zaptel.orig/files/patch-ztcfg_Makefile zaptel/files/patch-ztcfg_Makefile
--- zaptel.orig/files/patch-ztcfg_Makefile	Wed Dec 31 19:00:00 1969
+++ zaptel/files/patch-ztcfg_Makefile	Fri Mar  9 16:16:04 2007
@@ -0,0 +1,11 @@
+--- ztcfg/Makefile.orig	Fri Mar  9 16:13:50 2007
++++ ztcfg/Makefile	Fri Mar  9 16:14:09 2007
+@@ -2,7 +2,7 @@
+ 
+ LOCALBASE?=/usr/local
+ PREFIX?=/usr/local
+-CFLAGS+=-I${LOCALBASE}/include -I. -I../zaptel -DUSE_LOCAL_INCLUDE=1 \
++CFLAGS+=-I. -I../zaptel -I${LOCALBASE}/include -DUSE_LOCAL_INCLUDE=1 \
+ 	-DPREFIX=\"${PREFIX}\"
+ INSTALL=/usr/bin/install
+ BSD_INSTALL_PROGRAM?=${INSTALL} -o root -g wheel -m 755 -s
--- zaptel-1.1-update-fix.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: