From owner-svn-ports-all@FreeBSD.ORG Sat May 17 08:38:01 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 94B6F49C; Sat, 17 May 2014 08:38:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 765742C6D; Sat, 17 May 2014 08:38:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4H8c1KP032784; Sat, 17 May 2014 08:38:01 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4H8c00U032774; Sat, 17 May 2014 08:38:00 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201405170838.s4H8c00U032774@svn.freebsd.org> From: Martin Wilke Date: Sat, 17 May 2014 08:38:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354295 - in head/sysutils/toshctl: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 08:38:01 -0000 Author: miwi Date: Sat May 17 08:38:00 2014 New Revision: 354295 URL: http://svnweb.freebsd.org/changeset/ports/354295 QAT: https://qat.redports.org/buildarchive/r354295/ Log: - Fix build on -current - Add LICENSE PR: 187753 Submitted by: Ports Fury Added: head/sysutils/toshctl/files/ head/sysutils/toshctl/files/patch-tosh_bios.cpp (contents, props changed) head/sysutils/toshctl/files/patch-tosh_hci.cpp (contents, props changed) Modified: head/sysutils/toshctl/Makefile Modified: head/sysutils/toshctl/Makefile ============================================================================== --- head/sysutils/toshctl/Makefile Sat May 17 08:36:15 2014 (r354294) +++ head/sysutils/toshctl/Makefile Sat May 17 08:38:00 2014 (r354295) @@ -3,19 +3,29 @@ PORTNAME= toshctl PORTVERSION= 0.0.0p3 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://freebie.miraclenet.co.th/notebook/toshctl/ -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= A command-line tool to access parts of the Toshiba hardware interface +COMMENT= Command-line tool to access parts of the Toshiba hardware interface -ONLY_FOR_ARCHS= i386 -PLIST_FILES= bin/toshctl +LICENSE= GPLv2 # (or later) WRKSRC= ${WRKDIR}/toshctl +USES= tar:tgz + +PLIST_FILES= bin/toshctl + +ONLY_FOR_ARCHS= i386 + +post-patch: + @${REINPLACE_CMD} -e \ + 's|$$(CC)|$$(CXX)| ; \ + s|$$(CFLAGS)|$$(CXXFLAGS)|' ${WRKSRC}/Makefile + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + (cd ${WRKSRC} && ${INSTALL_PROGRAM} toshctl ${STAGEDIR}${PREFIX}/bin) .include Added: head/sysutils/toshctl/files/patch-tosh_bios.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/toshctl/files/patch-tosh_bios.cpp Sat May 17 08:38:00 2014 (r354295) @@ -0,0 +1,18 @@ +--- tosh_bios.cpp.orig ++++ tosh_bios.cpp +@@ -23,11 +23,12 @@ + static const char PROGRAM_ID[]="$Id: tosh_bios.cpp,v 1.4 2003/07/29 01:43:38 cws Exp $"; + + #include "tosh_utils.h" +-#include +-#include ++#include ++#include ++#include + #include + #include +-#include ++#include + + #include "toshibaIDs.hh" + #include "tosh_vars.h" Added: head/sysutils/toshctl/files/patch-tosh_hci.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/toshctl/files/patch-tosh_hci.cpp Sat May 17 08:38:00 2014 (r354295) @@ -0,0 +1,24 @@ +--- tosh_hci.cpp.orig ++++ tosh_hci.cpp +@@ -22,7 +22,8 @@ + static const char PROGRAM_ID[]="$Id: tosh_hci.cpp,v 1.5 2003/07/29 01:43:38 cws Exp $"; + + #include "tosh_hci.h" +-#include ++#include ++#include + + CToshVar* initToshHCI() + { +@@ -159,10 +160,10 @@ + unsigned result_a,result_c; + + asm ("inb $0xb2,%%al\n\t" +- "jc hci_call_error\n\t" ++ "jc 0f\n\t" + "movl %%ecx,%%eax\n\t" + "xor %%eax,%%eax\n" +- "hci_call_error:" ++ "0:" + : "=a" (result_a) ,"=c" (result_c) + : "a" (eax), "b" (ebx), "c" (ecx), "d" (edx));