From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 31 04:30:13 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BCD6106566B for ; Sat, 31 Dec 2011 04:30:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 68C858FC0C for ; Sat, 31 Dec 2011 04:30:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pBV4UDai054383 for ; Sat, 31 Dec 2011 04:30:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pBV4UDUh054380; Sat, 31 Dec 2011 04:30:13 GMT (envelope-from gnats) Resent-Date: Sat, 31 Dec 2011 04:30:13 GMT Resent-Message-Id: <201112310430.pBV4UDUh054380@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jake Smith Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03E52106566B for ; Sat, 31 Dec 2011 04:20:23 +0000 (UTC) (envelope-from jake@xz.cx) Received: from fs.xz.cx (fs.xz.cx [81.31.102.2]) by mx1.freebsd.org (Postfix) with ESMTP id E2A158FC18 for ; Sat, 31 Dec 2011 04:20:21 +0000 (UTC) Received: from fs.xz.cx (localhost [127.0.0.1]) by fs.xz.cx (8.14.4/8.14.4) with ESMTP id pBV3w6QD009733 for ; Sat, 31 Dec 2011 03:58:06 GMT (envelope-from jake@xz.cx) Received: (from root@localhost) by fs.xz.cx (8.14.4/8.14.4/Submit) id pBV3w5XA009732; Sat, 31 Dec 2011 03:58:05 GMT (envelope-from jake@xz.cx) Message-Id: <201112310358.pBV3w5XA009732@fs.xz.cx> Date: Sat, 31 Dec 2011 03:58:05 GMT From: Jake Smith To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/163729: [MAINTAINER] devel/libk8055: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Dec 2011 04:30:13 -0000 >Number: 163729 >Category: ports >Synopsis: [MAINTAINER] devel/libk8055: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 31 04:30:12 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jake Smith >Release: FreeBSD 8.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD fs.xz.cx 8.2-RELEASE FreeBSD 8.2-RELEASE #0 r219081M: Wed Mar 2 08:29:52 >Description: [DESCRIBE CHANGES] Added file(s): - files/patch-Makefile Fixed compile with CLANG Fixed broken on 7.x, libusb depend added Added Custom LOCALBASE and PREFIX for QATty Will only fallback to gcc if no other compiler is set Fully tested with redports.org >How-To-Repeat: >Fix: --- libk8055-0.2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/libk8055/Makefile /usr/home/jake/redports/export/jake/devel/libk8055/Makefile --- /usr/ports/devel/libk8055/Makefile 2011-12-08 20:19:29.000000000 +0000 +++ /usr/home/jake/redports/export/jake/devel/libk8055/Makefile 2011-12-31 03:27:04.767185000 +0000 @@ -17,6 +17,7 @@ MAN1= k8055.1 MANCOMPRESSED= yes USE_LDCONFIG= yes +USE_CSTD= gnu89 PLIST_FILES= bin/k8055 \ lib/libk8055.c \ @@ -27,8 +28,10 @@ .include -.if ${OSVERSION} < 800000 -BROKEN= does not compile on FreeBSD 7.X +.if ${OSVERSION} < 800069 +LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .endif post-patch: diff -ruN --exclude=CVS /usr/ports/devel/libk8055/files/patch-Makefile /usr/home/jake/redports/export/jake/devel/libk8055/files/patch-Makefile --- /usr/ports/devel/libk8055/files/patch-Makefile 1970-01-01 01:00:00.000000000 +0100 +++ /usr/home/jake/redports/export/jake/devel/libk8055/files/patch-Makefile 2011-12-31 03:15:57.558476000 +0000 @@ -0,0 +1,47 @@ +--- Makefile.orig 2011-12-31 03:12:14.464658120 +0000 ++++ Makefile 2011-12-31 03:12:42.754252842 +0000 +@@ -1,22 +1,22 @@ +-cc = gcc ++CC ?= gcc + exec = k8055 +-bindir = /usr/local/bin +-libdir = /usr/local/lib +-includedir = /usr/local/include +-mandir = /usr/local/man/man1 ++bindir = ${PREFIX}/bin ++libdir = ${PREFIX}/lib ++includedir = ${PREFIX}/include ++mandir = ${MANPREFIX}/man/man1 + OBJS = main.o libk8055.o + # if your are using Linux comment out next line +-CFLAGS = -DDAEMON -Wall -D_BSD ++CFLAGS += -DDAEMON -Wall -D_BSD + # if you are using Linux incomment following line + #CFLAGS = -DDAEMON -Wall + +-libs = -lusb -L/usr/lib -lm ++libs = -lusb -L/usr/lib ${LDFLAGS} -lm + + libk8055.so.0.1: libk8055.o +- $(cc) -Wall -o libk8055.so.0.2 -shared libk8055.o ++ $(CC) -Wall -o libk8055.so.0.2 -shared libk8055.o + + libk8055.o: libk8055.c +- $(cc) -Wall -O -c -g -fPIC $(CFLAGS) libk8055.c ++ $(CC) -Wall -O -c -g -fPIC $(CFLAGS) libk8055.c + -ln -sf libk8055.so.0.2 libk8055.so + + libk8055.c: k8055.h +@@ -24,10 +24,10 @@ + all: k8055_prog libk8055.so.0.1 + + %.o: %.c +- $(cc) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) -c $< + + k8055_prog: $(OBJS) +- $(cc) $(OBJS) -o $(exec) $(libs) ++ $(CC) $(OBJS) -o $(exec) $(libs) + strip $(exec) + + clean: --- libk8055-0.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: