svn commit: r316831 - in head: astro/fowsr astro/gpsbabel audio/ardour comms/dfu-programmer comms/gnokii comms/gnuradio comms/libticables devel/avarice devel/avrdude devel/libftdi devel/libhid deve...
Rene Ladan
rene at FreeBSD.org
Mon Apr 29 16:43:11 UTC 2013
Author: rene
Date: Mon Apr 29 16:43:05 2013
New Revision: 316831
URL: http://svnweb.freebsd.org/changeset/ports/316831
Log:
In preparation of removing devel/libusb (expires 2013-04-30), remove it
from these ports.
Other changes:
- convert Makefile header
- convert to optionsNG
- remove indefinite article from comment
- drop support for FreeBSD < 8.0
- pet portlint (leave library ABI versions in LIB_DEPENDS)
- net-mgmt/spectools: change option name from GTK to GTK2 to use default
description from bsd.options.desc.mk
Approved by: portmgr (bapt)
Modified:
head/astro/fowsr/Makefile (contents, props changed)
head/astro/gpsbabel/Makefile
head/audio/ardour/Makefile
head/comms/dfu-programmer/Makefile (contents, props changed)
head/comms/gnokii/Makefile
head/comms/gnuradio/Makefile
head/comms/libticables/Makefile
head/devel/avarice/Makefile (contents, props changed)
head/devel/avrdude/Makefile (contents, props changed)
head/devel/libftdi/Makefile
head/devel/libhid/Makefile (contents, props changed)
head/devel/libk8055/Makefile (contents, props changed)
head/devel/libnfc/Makefile
head/devel/libnfc/pkg-descr (contents, props changed)
head/devel/libnxt/Makefile (contents, props changed)
head/devel/libnxt/pkg-descr (contents, props changed)
head/devel/libpafe/Makefile (contents, props changed)
head/devel/mspdebug/Makefile (contents, props changed)
head/devel/openocd/Makefile
head/devel/p5-Device-USB/Makefile (contents, props changed)
head/devel/py-usb/Makefile (contents, props changed)
head/devel/roboctl/Makefile (contents, props changed)
head/devel/roboctl/pkg-descr (contents, props changed)
head/graphics/libgphoto2/Makefile
head/graphics/lprof-devel/Makefile
head/graphics/multican/Makefile
head/graphics/sane-epkowa/Makefile (contents, props changed)
head/graphics/sane-epkowa/pkg-descr (contents, props changed)
head/net-mgmt/spectools/Makefile (contents, props changed)
head/palm/pilot-link/Makefile
head/print/cups-base/Makefile
head/print/hplip/Makefile
head/security/bsp_upektfmess/Makefile
head/security/gnupg/Makefile
head/security/ykpers/Makefile
head/sysutils/asusoled/Makefile (contents, props changed)
head/sysutils/lcdproc/Makefile
head/sysutils/nut/Makefile
head/sysutils/scanbuttond/Makefile (contents, props changed)
head/sysutils/scanbuttond/pkg-descr (contents, props changed)
head/sysutils/usbutils/Makefile (contents, props changed)
head/x11/kde4-workspace/Makefile
Modified: head/astro/fowsr/Makefile
==============================================================================
--- head/astro/fowsr/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/astro/fowsr/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,5 @@
-# ports collection makefile for: fowsr
-# Date created: 01 Sep 2010
-# Whom: Alexander Leidinger
-#
+# Created by: Alexander Leidinger
# $FreeBSD$
-#
PORTNAME= fowsr
PORTVERSION= ${FILEVER}.${FILEDATE}
@@ -14,11 +10,12 @@ DISTNAME= fowsr-${FILEVER}-${FILEDATE}
MAINTAINER= netchild at FreeBSD.org
COMMENT= Fine Offset Weather Station Reader
+LICENSE= GPLv3
+
FILEVER= 1.0
FILEDATE= 20100718
WRKSRC= ${WRKDIR}/${PORTNAME}-${FILEVER}
-LICENSE= GPLv3
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
@@ -34,12 +31,4 @@ post-patch:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/fowsr ${PREFIX}/bin/
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/astro/gpsbabel/Makefile
==============================================================================
--- head/astro/gpsbabel/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/astro/gpsbabel/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -8,7 +8,7 @@ MASTER_SITES= https://secure.ohos.nl/dow
LOCAL/beech
MAINTAINER= dev2 at heesakkers.info
-COMMENT= A GPS file translating tool
+COMMENT= GPS file translating tool
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
@@ -19,12 +19,6 @@ CONFIGURE_ARGS+=--with-expathdr=${LOCALB
PLIST_FILES= bin/gpsbabel
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-.else
EXTRA_PATCHES= ${FILESDIR}/extra-patch-libusb
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/audio/ardour/Makefile
==============================================================================
--- head/audio/ardour/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/audio/ardour/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -32,11 +32,7 @@ PLIST_SUB= DISTVERSION=${DISTVERSION}
OPTIONS_DEFINE= OPTIMIZED_CFLAGS VST
VST_DESC= VST plugins support
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-.endif
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MVST}
SCONS_ENV+= VST=yes
@@ -53,7 +49,7 @@ PLIST_SUB+= VST="@comment "
.endif
# Upstream uses these flags by default
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
CFLAGS+= -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce
. if ${ARCH} == "amd64"
SCONS_ENV+= DIST_TARGET=x86_64
@@ -77,4 +73,4 @@ post-install:
@${MKDIR} ${TEMPLATESDIR}
${INSTALL_DATA} ${WRKSRC}/templates/*.template ${TEMPLATESDIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/comms/dfu-programmer/Makefile
==============================================================================
--- head/comms/dfu-programmer/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/comms/dfu-programmer/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -19,12 +19,7 @@ PLIST_FILES= bin/dfu-programmer
MAN1= dfu-programmer.1
PORTDOCS= *
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-CONFIGURE_ARGS+=--disable-libusb_1_0
-.endif
+.include <bsd.port.options.mk>
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
@@ -34,4 +29,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/comms/gnokii/Makefile
==============================================================================
--- head/comms/gnokii/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/comms/gnokii/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -63,12 +63,8 @@ LIB_DEPENDS+= ical:${PORTSDIR}/devel/li
CONFIGURE_ARGS+= --disable-libical
.endif
-.if ${OSVERSION} < 800069
-. if ${PORT_OPTIONS:MUSB}
-LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
-. else
+. if ! ${PORT_OPTIONS:MUSB}
CONFIGURE_ARGS+= --disable-libusb
-. endif
.endif
.if ${PORT_OPTIONS:MPCSC}
Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/comms/gnuradio/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -46,10 +46,7 @@ OPTIONS_DEFAULT= USRP
USRP_DESC= Include USRP support (UHD) from Ettus
TESTING_DESC= Include testing support
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-.endif
+.include <bsd.port.options.mk>
PLIST_SUB+= PORTVERSION=${PORTVERSION}
@@ -130,4 +127,4 @@ post-install:
@${ECHO} conf files are in ${PREFIX}/etc/gnuradio/conf.d
@${ECHO}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/comms/libticables/Makefile
==============================================================================
--- head/comms/libticables/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/comms/libticables/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,7 +1,4 @@
-# New ports collection makefile for: libticables
-# Date created: 27 August 2003
-# Whom: Tijl Coosemans <tijl at ulyssis.org>
-#
+# Created by: Tijl Coosemans <tijl at ulyssis.org>
# $FreeBSD$
#
@@ -25,12 +22,6 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-.else
EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/avarice/Makefile
==============================================================================
--- head/devel/avarice/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/avarice/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: avarice
-# Date created: 13 April 2003
-# Whom: Brian Dean <bsd at FreeBSD.org>
-#
+# Created by: Brian Dean <bsd at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= avarice
PORTVERSION= 2.12
@@ -20,14 +16,8 @@ USE_BZIP2= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
+#CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
MAN1= avarice.1 ice-gdb.1 ice-insight.1
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/avrdude/Makefile
==============================================================================
--- head/devel/avrdude/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/avrdude/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: avrdude
-# Date created: 8 April 2003
-# Whom: Brian Dean <bsd at FreeBSD.org>
-#
+# Created by: Brian Dean <bsd at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= avrdude
PORTVERSION= 5.11
@@ -24,10 +20,4 @@ LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_UNSAFE= yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/libftdi/Makefile
==============================================================================
--- head/devel/libftdi/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/libftdi/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -8,9 +8,9 @@ CATEGORIES= devel
MASTER_SITES= http://www.intra2net.com/en/developer/libftdi/download/
MAINTAINER= o.davydenko at gmail.com
-COMMENT= A library (using libusb) to talk to FTDI chips
+COMMENT= Library (using libusb) to talk to FTDI chips
-OPTIONS= BOOST "Build with boost" off
+OPTIONS_DEFINE= BOOST
USE_AUTOTOOLS= autoconf libtool automake
GNU_CONFIGURE= yes
@@ -20,9 +20,9 @@ USE_GNOME= pkgconfig gnomehack
PORTDOCS= COPYING.LIB ChangeLog README
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_BOOST)
+.if ${PORT_OPTIONS:MBOOST}
PLIST_SUB+= BOOST=""
CONFIGURE_ARGS+= --with-boost
CXXFLAGS+= "-I${LOCALBASE}/include"
@@ -32,11 +32,7 @@ PLIST_SUB+= BOOST="@comment "
CONFIGURE_ARGS+= --without-boost
.endif
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
-.else
EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure.in
-.endif
post-patch:
@${REINPLACE_CMD} -E -e \
@@ -47,9 +43,9 @@ pre-configure:
@cd ${WRKSRC} && ${AUTORECONF} --force --install
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/libhid/Makefile
==============================================================================
--- head/devel/libhid/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/libhid/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libhid
-# Date created: 16 July 2007
-# Whom: ntarmos at ceid.upatras.gr
-#
+# Created by: ntarmos at ceid.upatras.gr
# $FreeBSD$
-#
PORTNAME= libhid
PORTVERSION= 0.2.16
@@ -12,7 +8,7 @@ CATEGORIES= devel
MASTER_SITES= http://alioth.debian.org/frs/download.php/1958/
MAINTAINER= ntarmos at cs.uoi.gr
-COMMENT= A user-space HID access library written in C
+COMMENT= User-space HID access library written in C
MAN1= libhid-detach-device.1
MANCOMPRESSED= no
@@ -28,12 +24,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/xsltpro
HAS_CONFIGURE= yes
CONFIGURE_ARGS+=--prefix=${PREFIX} --mandir=${MANPREFIX}/man --without-doxygen
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
-.else
EXTRA_PATCHES= ${FILESDIR}/extra-patch-usb
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/libk8055/Makefile
==============================================================================
--- head/devel/libk8055/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/libk8055/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libk8055
-# Date created: 9 October 2011
-# Whom: Jake Smith <jake at xz.cx>
-#
+# Created by: Jake Smith <jake at xz.cx>
# $FreeBSD$
-#
PORTNAME= libk8055
PORTVERSION= 0.2
@@ -26,15 +22,7 @@ PLIST_FILES= bin/k8055 \
lib/libk8055.so.0.2 \
include/k8055.h
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-.endif
-
post-patch:
@${RM} ${WRKSRC}/libk8055.c.orig
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/libnfc/Makefile
==============================================================================
--- head/devel/libnfc/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/libnfc/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -53,7 +53,7 @@ PN531USB_DRIVER=pn531_usb,
PN531USB_DRIVER=
.endif
-.if ${PORT_OPTIONS:MP532UART}
+.if ${PORT_OPTIONS:MPN532UART}
PN532UART_DRIVER=pn532_uart,
.else
PN532UART_DRIVER=
@@ -78,14 +78,6 @@ LIB_DEPENDS+= pcsclite.1:${PORTSDIR}/dev
RUN_DEPENDS+= ${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so:${PORTSDIR}/devel/libccid
.endif
-.if ${PORT_OPTIONS:MPN531USB} || ${PORT_OPTIONS:MPN533USB}
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-.endif
-.endif
-
post-install:
.if ${PORT_OPTIONS:MEXAMPLES}
${MKDIR} ${EXAMPLESDIR}
Modified: head/devel/libnfc/pkg-descr
==============================================================================
--- head/devel/libnfc/pkg-descr Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/libnfc/pkg-descr Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,4 +1,4 @@
The libnfc provides a simple yet complete low-level API for handling NFC
devices and building NFC applications.
-WWW: http://www.libnfc.org
+WWW: http://www.libnfc.org
Modified: head/devel/libnxt/Makefile
==============================================================================
--- head/devel/libnxt/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/libnxt/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libnxt
-# Date created: 2007-05-05
-# Whom: Jason Bacon <bacon11 at tds.net>
-#
+# Created by: Jason Bacon <bacon11 at tds.net>
# $FreeBSD$
-#
PORTNAME= libnxt
PORTVERSION= 0.3
@@ -20,12 +16,6 @@ BUILD_DEPENDS= scons:${PORTSDIR}/devel/s
SUB_FILES= pkg-message
USE_LDCONFIG= yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
-.endif
-
do-build:
(cd ${WRKSRC}; scons)
@@ -42,4 +32,4 @@ do-install:
post-install:
@${CAT} ${WRKDIR}/pkg-message
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/libnxt/pkg-descr
==============================================================================
--- head/devel/libnxt/pkg-descr Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/libnxt/pkg-descr Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,3 +1,3 @@
Lego Mindstorms NXT firmware management tools and library.
-WWW: http://libnxt.googlecode.com
+WWW: http://libnxt.googlecode.com
Modified: head/devel/libpafe/Makefile
==============================================================================
--- head/devel/libpafe/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/libpafe/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -24,15 +24,7 @@ PLIST_FILES= bin/felica_dump bin/pasori_
lib/libpafe.a lib/libpafe.so lib/libpafe.la lib/libpafe.so.0
PLIST_DIRS= include/libpafe
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb-0:${PORTSDIR}/devel/libusb
-CPPFLAGS+= -I${PREFIX}/include
-LDFLAGS+= -L${PREFIX}/lib
-.else
CONFIGURE_ENV+= LIBUSB_CFLAGS="-I/usr/include" \
LIBUSB_LIBS="-L/usr/lib -lusb"
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/mspdebug/Makefile
==============================================================================
--- head/devel/mspdebug/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/mspdebug/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,6 @@
-# New ports collection makefile for: mspdebug
-# Date created: 30 Jan 2011
-# Whom: Peter Jeremy <peterjeremy at acm.org>
-#
+# Created by: Peter Jeremy <peterjeremy at acm.org>
# $FreeBSD$
-#
+
# Based on the OpenBSD port by: Jasper Lievisse Adriaanse <jasper at openbsd.org>
PORTNAME= mspdebug
@@ -21,14 +18,8 @@ USE_GMAKE= yes
PLIST_FILES= bin/mspdebug
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-.endif
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mspdebug ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/mspdebug.man ${PREFIX}/man/man1/mspdebug.1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/openocd/Makefile
==============================================================================
--- head/devel/openocd/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/openocd/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -11,31 +11,39 @@ COMMENT= Open On-Chip Debugger
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-werror
-OPTIONS= DOC "Build HTML and PDF documentation with Doxygen" on \
- JIMTCL "Build with internal JimTCL interpreter" on \
- VERBOSE "Enable verbose JTAG I/O messages" off \
- JTAG_IO "Enable verbose JTAG I/O messages" off \
- USB_IO "Enable verbose USB I/O messages" off \
- PARPORT "Support Parallel Port based drivers" on \
- DUMMY "Support Dummy Driver" on \
- FT2232 "Support FT2232 based USB devices (using libftdi)" on \
- FTDI "Support experimental FTDI+MPSSE+libusb-1.0 async." on \
- USBBLASTER "Support USB-Blaster Programmer (using libftdi)" on \
- EP93XX "Support EP93xx based SBCs" on \
- AT91RM9200 "Support AT91RM9200 based SBCs" on \
- PRESTO "Support ASIX Presto Programmer (using libftdi)" on \
- USBPROG "Support USB-Prog JTAG Programmer" on \
- JLINK "Support Segger J-Link JTAG Programmer" on \
- VSLLINK "Support Versaloon-Link JTAG Programmer" on \
- RLINK "Support Raisonance RLink JTAG Programmer" on \
- ULINK "Support Keil ULINK-JTAG Programmer" on \
- ARMJTAGEW "Support Olimex ARM-JTAG-EW Programmer" on \
- BUSPIRATE "Support BusPirate Programmer" on \
- STLINK "Support STLink Programmer" on \
- OSBDM "Support OSBDM Programmer (JTAG only)" on \
- OPENDOUS "Support EStick/OpenDous Programmer" on \
- RMTBITBANG "Support Remote-Bitbang Driver" on \
- MINIDRIVER "Dummy minidriver only (will exclude others!)" off
+
+OPTIONS_DEFINE= DOC JIMTCL VERBOSE JTAG_IO USB_IO PARPORT DUMMY FT2232 FTDI \
+ USBBLASTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \
+ ARMJTAGEW BUSPIRATE STLINK OSBDM OPENDOUS RMTBITBANG MINIDRIVER
+OPTIONS_DEFAULT=DOC JIMTCL PARPORT DUMMY FT2232 FTDI USBBLASTER EP93XX \
+ AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK ARMJTAGEW \
+ BUSPIRATE STLINK OSBDM OPENDOUS RMTBITBANG
+
+DOC_DESC= Build HTML and PDF documentation with Doxygen
+JIMTCL_DESC= Build with internal JimTCL interpreter
+VERBOSE_DESC= Enable verbose JTAG I/O messages
+JTAG_IO_DESC= Enable verbose JTAG I/O messages
+USB_IO_DESC= Enable verbose USB I/O messages
+PARPORT_DESC= Support Parallel Port based drivers
+DUMMY_DESC= Support Dummy Driver
+FT2232_DESC= Support FT2232 based USB devices (using libftdi)
+FTDI_DESC= Support experimental FTDI+MPSSE+libusb-1.0 async.
+USBBLASTER_DESC=Support USB-Blaster Programmer (using libftdi)
+EP93XX_DESC= Support EP93xx based SBCs
+AT91RM9200_DESC=Support AT91RM9200 based SBCs
+PRESTO_DESC= Support ASIX Presto Programmer (using libftdi)
+USBPROG_DESC= Support USB-Prog JTAG Programmer
+JLINK_DESC= Support Segger J-Link JTAG Programmer
+VSLLINK_DESC= Support Versaloon-Link JTAG Programmer
+RLINK_DESC= Support Raisonance RLink JTAG Programmer
+ULINK_DESC= Support Keil ULINK-JTAG Programmer
+ARMJTAGEW_DESC= Support Olimex ARM-JTAG-EW Programmer
+BUSPIRATE= Support BusPirate Programmer
+STLINK_DESC= Support STLink Programmer
+OSBDM_DESC= Support OSBDM Programmer (JTAG only)
+OPENDOUS= Support EStick/OpenDous Programmer
+RMTBITBANG_DESC=Support Remote-Bitbang Driver
+MINIDRIVER_DESC=Dummy minidriver only (will exclude others!)
MAN1= ${PORTNAME}.1
INFO= ${PORTNAME}
@@ -50,227 +58,221 @@ CFLAGS+= -I${LOCALBASE}/include -L${LOCA
.include <bsd.port.options.mk>
-.if defined(WITH_DOC)
+.if ${PORT_OPTIONS:MDOC}
CONFIGURE_ARGS+= --enable-doxygen-pdf
WITH_DOXYGEN= yes
.else
CONFIGURE_ARGS+= --disable-doxygen-pdf --disable-doxygen-html
.endif
-.if defined(WITH_JIMTCL)
+.if ${PORT_OPTIONS:MJIMTCL}
CONFIGURE_ARGS+= --enable-internal-jimtcl
.else
CONFIGURE_ARGS+= --disable-internal-jimtcl
.endif
-.if defined(WITH_VERBOSE)
+.if ${PORT_OPTIONS:MVERBOSE}
CONFIGURE_ARGS+= --enable-verbose
.else
CONFIGURE_ARGS+= --disable-verbose
.endif
-.if defined(WITH_JTAG_IO)
+.if ${PORT_OPTIONS:MJTAG_IO}
CONFIGURE_ARGS+= --enable-verbose-jtag-io
.else
CONFIGURE_ARGS+= --disable-verbose-jtag-io
.endif
-.if defined(WITH_USB_IO)
+.if ${PORT_OPTIONS:MUSB_IO}
CONFIGURE_ARGS+= --enable-verbose-usb-io
.else
CONFIGURE_ARGS+= --disable-verbose-usb-io
.endif
-.if defined(WITH_USB_COMMS)
+.if ${PORT_OPTIONS:MUSB_COMMS}
CONFIGURE_ARGS+= --enable-verbose-usb-comms
.else
CONFIGURE_ARGS+= --disable-verbose-usb-comms
.endif
-.if defined(WITH_MALLOC)
+.if ${PORT_OPTIONS:MMALLOC}
CONFIGURE_ARGS+= --enable-malloc-logging
.else
CONFIGURE_ARGS+= --disable-malloc-logging
.endif
-.if defined(WITH_PARPORT)
+.if ${PORT_OPTIONS:MPARPORT}
CONFIGURE_ARGS+= --enable-parport
.else
CONFIGURE_ARGS+= --disable-parport
.endif
-.if defined(WITH_DUMMY)
+.if ${PORT_OPTIONS:MDUMMY}
CONFIGURE_ARGS+= --enable-dummy
.else
CONFIGURE_ARGS+= --disable-dummy
.endif
-.if defined(WITH_FT2232)
+.if ${PORT_OPTIONS:MFT2232}
CONFIGURE_ARGS+= --enable-ft2232_libftdi
WITH_LIBFTDI= yes
.else
CONFIGURE_ARGS+= --disable-ft2232_libftdi
.endif
-.if defined(WITH_FTDI)
+.if ${PORT_OPTIONS:MFTDI}
CONFIGURE_ARGS+= --enable-ftdi
.else
CONFIGURE_ARGS+= --disable-ftdi
.endif
-.if defined(WITH_USBBLASTER)
+.if ${PORT_OPTIONS:MUSBBLASTER}
CONFIGURE_ARGS+= --enable-usb_blaster_libftdi
.else
CONFIGURE_ARGS+= --disable-usb_blaster_libftdi
.endif
-.if defined(WITH_AMTJTAGACCEL)
+.if ${PORT_OPTIONS:MAMTJTAGACCEL}
CONFIGURE_ARGS+= --enable-amtjtagaccel
.else
CONFIGURE_ARGS+= --disable-amtjtagaccel
.endif
-.if defined(WITH_ECOSBOARD)
+.if ${PORT_OPTIONS:MECOSBOARD}
CONFIGURE_ARGS+= --enable-ecosboard
.else
CONFIGURE_ARGS+= --disable-ecosboard
.endif
-.if defined(WITH_ZY1000)
+.if ${PORT_OPTIONS:MZY1000}
CONFIGURE_ARGS+= --enable-zy1000
.else
CONFIGURE_ARGS+= --disable-zy1000
.endif
-.if defined(WITH_IOUTIL)
+.if ${PORT_OPTIONS:MIOUTIL}
CONFIGURE_ARGS+= --enable-ioutil
.else
CONFIGURE_ARGS+= --disable-ioutil
.endif
-.if defined(WITH_EP93XX)
+.if ${PORT_OPTIONS:MEP93XX}
CONFIGURE_ARGS+= --enable-ep93xx
.else
CONFIGURE_ARGS+= --disable-ep93xx
.endif
-.if defined(WITH_AT91RM9200)
+.if ${PORT_OPTIONS:MAT91RM9200}
CONFIGURE_ARGS+= --enable-at91rm9200
.else
CONFIGURE_ARGS+= --disable-at91rm9200
.endif
-.if defined(WITH_GW16012)
+.if ${PORT_OPTIONS:MGW16012}
CONFIGURE_ARGS+= --enable-gw16012
.else
CONFIGURE_ARGS+= --disable-gw16012
.endif
-.if defined(WITH_PRESTO)
+.if ${PORT_OPTIONS:MPRESTO}
CONFIGURE_ARGS+= --enable-presto_libftdi
WITH_LIBFTDI= yes
.else
CONFIGURE_ARGS+= --disable-presto_libftdi
.endif
-.if defined(WITH_USBPROG)
+.if ${PORT_OPTIONS:MUSBPROG}
CONFIGURE_ARGS+= --enable-usbprog
WITH_LIBUSB= yes
.else
CONFIGURE_ARGS+= --disable-usbprog
.endif
-.if defined(WITH_OOCDTRACE)
+.if ${PORT_OPTIONS:MOOCDTRACE}
CONFIGURE_ARGS+= --enable-oocd_trace
.else
CONFIGURE_ARGS+= --disable-oocd_trace
.endif
-.if defined(WITH_JLINK)
+.if ${PORT_OPTIONS:MJLINK}
CONFIGURE_ARGS+= --enable-jlink
WITH_LIBUSB= yes
.else
CONFIGURE_ARGS+= --disable-jlink
.endif
-.if defined(WITH_VSLLINK)
+.if ${PORT_OPTIONS:MVSLLINK}
CONFIGURE_ARGS+= --enable-vsllink
WITH_LIBUSB= yes
.else
CONFIGURE_ARGS+= --disable-vsllink
.endif
-.if defined(WITH_RLINK)
+.if ${PORT_OPTIONS:MRLINK}
CONFIGURE_ARGS+= --enable-rlink
WITH_LIBUSB= yes
.else
CONFIGURE_ARGS+= --disable-rlink
.endif
-.if defined (WITH_ULINK)
+.if ${PORT_OPTIONS:MULINK}
CONFIGURE_ARGS+= --enable-ulink
.else
CONFIGURE_ARGS+= --disable-ulink
.endif
-.if defined(WITH_ARMJTAGEW)
+.if ${PORT_OPTIONS:MARMJTAGEW}
CONFIGURE_ARGS+= --enable-arm-jtag-ew
WITH_LIBUSB= yes
.else
CONFIGURE_ARGS+= --disable-arm-jtag-ew
.endif
-.if defined(WITH_BUSPIRATE)
+.if ${PORT_OPTIONS:MBUSPIRATE}
CONFIGURE_ARGS+= --enable-buspirate
.else
CONFIGURE_ARGS+= --disable-buspirate
.endif
-.if defined(WITH_STLINK)
+.if ${PORT_OPTIONS:MSTLINK}
CONFIGURE_ARGS+= --enable-stlink
.else
CONFIGURE_ARGS+= --disable-stlink
.endif
-.if defined(WITH_OSBDM)
+.if ${PORT_OPTIONS:MOSBDM}
CONFIGURE_ARGS+= --enable-osbdm
.else
CONFIGURE_ARGS+= --disable-osbdm
.endif
-.if defined(WITH_OPENDOUS)
+.if ${PORT_OPTIONS:MOPENDOUS}
CONFIGURE_ARGS+= --enable-opendous
.else
CONFIGURE_ARGS+= --disable-opendous
.endif
-.if defined(WITH_RMTBITBANG)
+.if ${PORT_OPTIONS:MRMTBITBANG}
CONFIGURE_ARGS+= --enable-remote-bitbang
.else
CONFIGURE_ARGS+= --disable-remote-bitbang
.endif
-.if defined(WITH_MINIDRIVER)
+.if ${PORT_OPTIONS:MMINIDRIVER}
CONFIGURE_ARGS+= --enable-minidriver-dummy
.else
CONFIGURE_ARGS+= --disable-minidriver-dummy
.endif
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_LIBUSB) && ${OSVERSION} < 800069
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-.endif
-
-.if defined(WITH_LIBFTDI)
+.if ${PORT_OPTIONS:MLIBFTDI}
LIB_DEPENDS+= ftdi:${PORTSDIR}/devel/libftdi
.endif
-.if defined(WITH_DOXYGEN)
+.if ${PORT_OPTIONS:MDOXYGEN}
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
.endif
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/p5-Device-USB/Makefile
==============================================================================
--- head/devel/p5-Device-USB/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/p5-Device-USB/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: p5-usb
-# Date created: 2007-05-05
-# Whom: Jason Bacon <jwbacon at tds.net>
-#
+# Created by: Jason Bacon <jwbacon at tds.net>
# $FreeBSD$
-#
PORTNAME= Device-USB
PORTVERSION= 0.35
@@ -30,11 +26,4 @@ MAN3= Device::USB.3 \
Device::USB::FAQ.3 \
Device::dump_usb.3
-.include <bsd.port.pre.mk>
-
-# libusb is in base for newer releases
-.if ${OSVERSION} < 800069
-LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/py-usb/Makefile
==============================================================================
--- head/devel/py-usb/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/py-usb/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: py-usb
-# Date created: 2007-05-13
-# Whom: R.Mahmatkhanov <R.Mahmatkhanov at SKYLINK.ru>
-#
+# Created by: R.Mahmatkhanov <R.Mahmatkhanov at SKYLINK.ru>
# $FreeBSD$
-#
PORTNAME= usb
PORTVERSION= 0.4.3
@@ -22,20 +18,12 @@ PYDISTUTILS_PKGNAME= py${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-
-post-patch:
- ${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/setup.py
-
-.endif
+.include <bsd.port.options.mk>
post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/samples/* ${EXAMPLESDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/roboctl/Makefile
==============================================================================
--- head/devel/roboctl/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/roboctl/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: roboctl
-# Date created: 2007-05-03
-# Whom: Jason Bacon <jwbacon at tds.net>
-#
+# Created by: Jason Bacon <jwbacon at tds.net>
# $FreeBSD$
-#
PORTNAME= roboctl
PORTVERSION= 0.3.7
@@ -19,18 +15,15 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libgamep
MAKE_ENV= EXTRALIBS=-lbluetooth
MAKE_JOBS_UNSAFE= yes
-OPTIONS= CUTECOM "Install cutecom for Vex debugging" Off
+OPTIONS_DEFINE= CUTECOM
+CUTECOM_DESC= Install cutecom for Vex debugging
MAN1= legoctl.1 vexctl.1 nxtremote.1
MAN3= roboctl.3
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
-.endif
-
-.if defined(WITH_CUTECOM)
+.if ${PORT_OPTIONS:MCUTECOM}
RUN_DEPENDS+= cutecom:${PORTSDIR}/comms/cutecom
.endif
@@ -43,4 +36,4 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/Scripts/lego_bluetooth_config ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/Commands/NXTRemote/nxtremote.1 ${MANPREFIX}/man/man1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/roboctl/pkg-descr
==============================================================================
--- head/devel/roboctl/pkg-descr Mon Apr 29 16:10:07 2013 (r316830)
+++ head/devel/roboctl/pkg-descr Mon Apr 29 16:43:05 2013 (r316831)
@@ -4,4 +4,4 @@ and other data to the controller, examin
as battery level, firmware version, etc., and control the robot
remotely from a Unix workstation.
-WWW: http://personalpages.tds.net/~jwbacon/Ports
+WWW: http://personalpages.tds.net/~jwbacon/Ports
Modified: head/graphics/libgphoto2/Makefile
==============================================================================
--- head/graphics/libgphoto2/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/graphics/libgphoto2/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -8,7 +8,7 @@ CATEGORIES= graphics
MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION}
MAINTAINER= pav at FreeBSD.org
-COMMENT= A universal digital camera picture control tool
+COMMENT= Universal digital camera picture control tool
LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \
jpeg.11:${PORTSDIR}/graphics/jpeg
@@ -34,16 +34,7 @@ USES+= gettext
PLIST_SUB+= NLS=""
.endif
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800064
-LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
-.elif ${OSVERSION} < 800069
-CONFIGURE_ENV+= LIBUSB_LIBS="-L/usr/lib -lusb20" LIBUSB_CFLAGS="-I/usr/include/dev/usb -I/usr/include"
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-usb20
-.else
CONFIGURE_ENV+= LIBUSB_LIBS="-lusb" LIBUSB_CFLAGS="-I/usr/include"
-.endif
post-patch:
.for file in configure libgphoto2_port/configure
@@ -58,9 +49,7 @@ post-patch:
@${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; s| "$$(DESTDIR)$$(udevscriptdir)"||' ${WRKSRC}/libgphoto2_port/usb/Makefile.in ${WRKSRC}/packaging/generic/Makefile.in
@${REINPLACE_CMD} -e 's|linux-hotplug ||' ${WRKSRC}/packaging/Makefile.in
@${REINPLACE_CMD} -e 's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' ${WRKSRC}/doc/Makefile.in
-.if ${OSVERSION} >= 800064
@${REINPLACE_CMD} -e '/Requires/d' ${WRKSRC}/libgphoto2_port/libgphoto2_port.pc.in
-.endif
@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' ${WRKSRC}/libgphoto2_port/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/lprof-devel/Makefile
==============================================================================
--- head/graphics/lprof-devel/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/graphics/lprof-devel/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: lprof
-# Date created: 09 Jan 2008
-# Whom: Dmitry Marakasov <amdmi3 at amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3 at amdmi3.ru>
# $FreeBSD$
-#
PORTNAME= lprof
PORTVERSION= 20080514
@@ -31,12 +27,6 @@ CMAKE_ARGS= -DQTTRANS_LRELEASE_EXECUTABL
WRKSRC= ${WRKDIR}/${PORTNAME}
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
-.endif
-
post-patch:
@${REINPLACE_CMD} -e '/asm\/types.h/ d' ${WRKSRC}/src/argyll/spectro/hidio.c
@${REINPLACE_CMD} -e '/DESTINATION/ s|data/|share/${PORTNAME}/data/|' \
@@ -45,4 +35,4 @@ post-patch:
post-install:
${INSTALL_DATA} ${WRKSRC}/data/icons/lprof.png ${PREFIX}/share/pixmaps
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/multican/Makefile
==============================================================================
--- head/graphics/multican/Makefile Mon Apr 29 16:10:07 2013 (r316830)
+++ head/graphics/multican/Makefile Mon Apr 29 16:43:05 2013 (r316831)
@@ -20,13 +20,7 @@ PLIST_FILES= bin/multican lib/libmultica
PORTDOCS= ChangeLog README TODO
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800069
-LIB_DEPENDS= usb:${PORTSDIR}/devel/libusb
-CFLAGS+= -I${LOCALBASE}/include # does not uphold CPPFLAGS
-LDFLAGS+= -L${LOCALBASE}/lib
-.endif
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list