From pneumann@gmail.com  Sun May 13 00:43:10 2007
Return-Path: <pneumann@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D958116A404
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 May 2007 00:43:10 +0000 (UTC)
	(envelope-from pneumann@gmail.com)
Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.225])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BD9C13C43E
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 May 2007 00:43:10 +0000 (UTC)
	(envelope-from pneumann@gmail.com)
Received: by wx-out-0506.google.com with SMTP id s18so1238332wxc
        for <FreeBSD-gnats-submit@freebsd.org>; Sat, 12 May 2007 17:43:10 -0700 (PDT)
Received: by 10.70.87.9 with SMTP id k9mr7565915wxb.1179016989947;
        Sat, 12 May 2007 17:43:09 -0700 (PDT)
Received: from negro.transtel.cl ( [201.215.221.113])
        by mx.google.com with ESMTP id 3sm9328472wrs.2007.05.12.17.43.08;
        Sat, 12 May 2007 17:43:09 -0700 (PDT)
Message-Id: <1179006186.2671@negro.transtel.cl>
Date: Sat, 12 May 2007 17:43:06 -0400
From: Phillip Neumann <pneumann@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: sobomax@FreeBSD.org
Subject: [PATCH] misc/zaptel: enable amd64
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         112623
>Category:       ports
>Synopsis:       [PATCH] misc/zaptel: enable amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sobomax
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 13 00:50:04 GMT 2007
>Closed-Date:    Sun Jul 22 10:47:40 GMT 2007
>Last-Modified:  Sun Jul 22 10:47:40 GMT 2007
>Originator:     Phillip Neumann
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD negro.transtel.cl 6.2-STABLE FreeBSD 6.2-STABLE #1: Sun Feb 11 18:00:14 CLST 2007
>Description:
- Enable amd64
- Drop check for version < 5

thanks!

Port maintainer (sobomax@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- zaptel-1.4.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/zaptel/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile	26 Apr 2007 00:11:35 -0000	1.27
+++ Makefile	13 May 2007 00:41:13 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	zaptel
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.pbxpress.com/~gonzo/
 DISTNAME=	${PORTNAME}-bsd-${PORTVERSION}
@@ -18,7 +19,7 @@
 
 NO_PACKAGE=	Should be in sync with the kernel to work correctly
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 
 MAKE_ENV=	KMODDIR=${PREFIX}/lib/zaptel
 SUB_FILES=	pkg-message
@@ -26,10 +27,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-IGNORE=	does not build on FreeBSD \< 5.x
-.endif
-
 pre-everything::
 	@if [ ! -f /usr/src/sys/Makefile ]; then \
 		${ECHO_MSG} ">> The zaptel port needs FreeBSD kernel source code to compile."; \
@@ -41,6 +38,12 @@
 	@${REINPLACE_CMD} -e "s|<getopt.h>|<unistd.h>|g" \
 		${WRKSRC}/test/ztmonitor.c ${WRKSRC}/test/zttool.c \
 		${WRKSRC}/ztcfg/ztcfg.c
+.if ${ARCH} == "amd64"
+	@${REINPLACE_CMD} "s|HWMODULES+=tau32pci||g" ${WRKSRC}/Makefile
+PLIST_SUB+=	I386="@comment "
+.else
+PLIST_SUB+=	I386=""
+.endif
 
 pre-su-install:
 	@${MKDIR} ${PREFIX}/lib/zaptel
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/misc/zaptel/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- pkg-plist	26 Apr 2007 00:11:35 -0000	1.9
+++ pkg-plist	13 May 2007 00:41:13 -0000
@@ -10,7 +10,7 @@
 lib/libtonezone.a
 lib/zaptel/linker.hints
 lib/zaptel/qozap.ko
-lib/zaptel/tau32pci.ko
+%%I386%%lib/zaptel/tau32pci.ko
 lib/zaptel/wcfxo.ko
 lib/zaptel/wcfxs.ko
 lib/zaptel/wct1xxp.ko
--- zaptel-1.4.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sobomax 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun May 13 00:50:11 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112623 

From: "Phillip N." <pneumann@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/112623: [PATCH] misc/zaptel: enable amd64
Date: Sat, 12 May 2007 18:48:59 -0400

 --=-WaSfnLQ/7i8pjKU5Kgoi
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 
 Forgot, asterisk needs this for using libtone.
 sorry!
 
 
 --=-WaSfnLQ/7i8pjKU5Kgoi
 Content-Disposition: attachment; filename=zap.patch
 Content-Type: text/x-patch; name=zap.patch; charset=utf-8
 Content-Transfer-Encoding: 7bit
 
 --- Makefile.orig	Sat May 12 18:45:33 2007
 +++ Makefile	Sat May 12 18:46:00 2007
 @@ -40,6 +40,8 @@
  		${WRKSRC}/ztcfg/ztcfg.c
  .if ${ARCH} == "amd64"
  	@${REINPLACE_CMD} "s|HWMODULES+=tau32pci||g" ${WRKSRC}/Makefile
 +	@${REINPLACE_CMD} 's|PREFIX}\\"|PREFIX}\\" -fPIC|g' \
 +		${WRKSRC}/ztcfg/Makefile
  PLIST_SUB+=	I386="@comment "
  .else
  PLIST_SUB+=	I386=""
 
 --=-WaSfnLQ/7i8pjKU5Kgoi--
 

From: Maxim Sobolev <sobomax@FreeBSD.org>
To: bug-followup@FreeBSD.org, pneumann@gmail.com
Cc:  
Subject: Re: ports/112623: [PATCH] misc/zaptel: enable amd64
Date: Mon, 28 May 2007 11:22:37 -0700

 Have you actually tested it on amd64? I don't want to enable support 
 just because it compiles. Zaptel kernel code is very hairy so that I 
 won't be surprised if it has some issues with support for non-32bit arches.
 
 -Maxim

From: "Phillip N." <pneumann@gmail.com>
To: Maxim Sobolev <sobomax@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/112623: [PATCH] misc/zaptel: enable amd64
Date: Mon, 28 May 2007 18:17:54 -0400

 El lun, 28-05-2007 a las 11:22 -0700, Maxim Sobolev escribió:
 > Have you actually tested it on amd64? I don't want to enable support 
 > just because it compiles. Zaptel kernel code is very hairy so that I 
 > won't be surprised if it has some issues with support for non-32bit arches.
 > 
 > -Maxim
 
 Well, I test it on a cheap X101p card.
 
 Maybe there is a good idea to enable it with as "experimental", to
 revice feeddback from something else with a more descent hardware, and
 then enabled it by default...
 
 good luck!
 
State-Changed-From-To: open->closed 
State-Changed-By: sobomax 
State-Changed-When: Sun Jul 22 10:47:35 UTC 2007 
State-Changed-Why:  
Commited with some mods, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112623 
>Unformatted:
