diff options
42 files changed, 180 insertions, 436 deletions
diff --git a/astro/fowsr/Makefile b/astro/fowsr/Makefile index d7b50d4827b6..7c8821ab98ce 100644 --- a/astro/fowsr/Makefile +++ b/astro/fowsr/Makefile @@ -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@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> diff --git a/astro/gpsbabel/Makefile b/astro/gpsbabel/Makefile index 62e940335666..688c72cc8e83 100644 --- a/astro/gpsbabel/Makefile +++ b/astro/gpsbabel/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= https://secure.ohos.nl/downloads/ \ LOCAL/beech MAINTAINER= dev2@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=${LOCALBASE}/include \ 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> diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile index 63ec9fb95658..16e4630917fd 100644 --- a/audio/ardour/Makefile +++ b/audio/ardour/Makefile @@ -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> diff --git a/comms/dfu-programmer/Makefile b/comms/dfu-programmer/Makefile index ecf484489f9c..a87419358dbd 100644 --- a/comms/dfu-programmer/Makefile +++ b/comms/dfu-programmer/Makefile @@ -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> diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile index 30661da03d94..1fe84c8682ae 100644 --- a/comms/gnokii/Makefile +++ b/comms/gnokii/Makefile @@ -63,12 +63,8 @@ LIB_DEPENDS+= ical:${PORTSDIR}/devel/libical 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} diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index a49694bcbdd3..b5ce2cebc93c 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -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> diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile index 9f70a457a1ba..0476ac227a46 100644 --- a/comms/libticables/Makefile +++ b/comms/libticables/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: libticables -# Date created: 27 August 2003 -# Whom: Tijl Coosemans <tijl@ulyssis.org> -# +# Created by: Tijl Coosemans <tijl@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> diff --git a/devel/avarice/Makefile b/devel/avarice/Makefile index 61de840df97f..a10bd757780f 100644 --- a/devel/avarice/Makefile +++ b/devel/avarice/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: avarice -# Date created: 13 April 2003 -# Whom: Brian Dean <bsd@FreeBSD.org> -# +# Created by: Brian Dean <bsd@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> diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile index 5fe71614c5c6..ff55d68f32ca 100644 --- a/devel/avrdude/Makefile +++ b/devel/avrdude/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: avrdude -# Date created: 8 April 2003 -# Whom: Brian Dean <bsd@FreeBSD.org> -# +# Created by: Brian Dean <bsd@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> diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile index 97eba9d70b0f..9964eb4d3b6c 100644 --- a/devel/libftdi/Makefile +++ b/devel/libftdi/Makefile @@ -8,9 +8,9 @@ CATEGORIES= devel MASTER_SITES= http://www.intra2net.com/en/developer/libftdi/download/ MAINTAINER= o.davydenko@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> diff --git a/devel/libhid/Makefile b/devel/libhid/Makefile index 232632d937df..33cfc901dd4f 100644 --- a/devel/libhid/Makefile +++ b/devel/libhid/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libhid -# Date created: 16 July 2007 -# Whom: ntarmos@ceid.upatras.gr -# +# Created by: ntarmos@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@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/xsltproc:${PORTSDIR}/textproc/libxslt \ 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> diff --git a/devel/libk8055/Makefile b/devel/libk8055/Makefile index 1996aa81ff37..bcb7e6ddfa74 100644 --- a/devel/libk8055/Makefile +++ b/devel/libk8055/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libk8055 -# Date created: 9 October 2011 -# Whom: Jake Smith <jake@xz.cx> -# +# Created by: Jake Smith <jake@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> diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile index 0269b2d1a7ac..9a0bd9361a52 100644 --- a/devel/libnfc/Makefile +++ b/devel/libnfc/Makefile @@ -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}/devel/pcsc-lite 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} diff --git a/devel/libnfc/pkg-descr b/devel/libnfc/pkg-descr index 515016d68815..39ce5e6e5b9d 100644 --- a/devel/libnfc/pkg-descr +++ b/devel/libnfc/pkg-descr @@ -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 diff --git a/devel/libnxt/Makefile b/devel/libnxt/Makefile index 0a3fbbe12663..722e97c1a9ef 100644 --- a/devel/libnxt/Makefile +++ b/devel/libnxt/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libnxt -# Date created: 2007-05-05 -# Whom: Jason Bacon <bacon11@tds.net> -# +# Created by: Jason Bacon <bacon11@tds.net> # $FreeBSD$ -# PORTNAME= libnxt PORTVERSION= 0.3 @@ -20,12 +16,6 @@ BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons \ 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> diff --git a/devel/libnxt/pkg-descr b/devel/libnxt/pkg-descr index c3806a2fe79c..4ad545995b91 100644 --- a/devel/libnxt/pkg-descr +++ b/devel/libnxt/pkg-descr @@ -1,3 +1,3 @@ Lego Mindstorms NXT firmware management tools and library. -WWW: http://libnxt.googlecode.com +WWW: http://libnxt.googlecode.com diff --git a/devel/libpafe/Makefile b/devel/libpafe/Makefile index 093973cbeabd..5a459100665a 100644 --- a/devel/libpafe/Makefile +++ b/devel/libpafe/Makefile @@ -24,15 +24,7 @@ PLIST_FILES= bin/felica_dump bin/pasori_test \ 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> diff --git a/devel/mspdebug/Makefile b/devel/mspdebug/Makefile index f8b69a65800d..682e1f95c025 100644 --- a/devel/mspdebug/Makefile +++ b/devel/mspdebug/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: mspdebug -# Date created: 30 Jan 2011 -# Whom: Peter Jeremy <peterjeremy@acm.org> -# +# Created by: Peter Jeremy <peterjeremy@acm.org> # $FreeBSD$ -# + # Based on the OpenBSD port by: Jasper Lievisse Adriaanse <jasper@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> diff --git a/devel/openocd/Makefile b/devel/openocd/Makefile index 0e76eb73e6c2..af40f43d354b 100644 --- a/devel/openocd/Makefile +++ b/devel/openocd/Makefile @@ -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${LOCALBASE}/lib .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> diff --git a/devel/p5-Device-USB/Makefile b/devel/p5-Device-USB/Makefile index b306f6cf4d3c..545e442fec8c 100644 --- a/devel/p5-Device-USB/Makefile +++ b/devel/p5-Device-USB/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-usb -# Date created: 2007-05-05 -# Whom: Jason Bacon <jwbacon@tds.net> -# +# Created by: Jason Bacon <jwbacon@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> diff --git a/devel/py-usb/Makefile b/devel/py-usb/Makefile index 41346d3ec712..07fe6ac7ddb5 100644 --- a/devel/py-usb/Makefile +++ b/devel/py-usb/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: py-usb -# Date created: 2007-05-13 -# Whom: R.Mahmatkhanov <R.Mahmatkhanov@SKYLINK.ru> -# +# Created by: R.Mahmatkhanov <R.Mahmatkhanov@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> diff --git a/devel/roboctl/Makefile b/devel/roboctl/Makefile index dd405369bfc9..ffa7bb46d4cd 100644 --- a/devel/roboctl/Makefile +++ b/devel/roboctl/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: roboctl -# Date created: 2007-05-03 -# Whom: Jason Bacon <jwbacon@tds.net> -# +# Created by: Jason Bacon <jwbacon@tds.net> # $FreeBSD$ -# PORTNAME= roboctl PORTVERSION= 0.3.7 @@ -19,18 +15,15 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libgamepad.a:${PORTSDIR}/devel/libgamepad 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> diff --git a/devel/roboctl/pkg-descr b/devel/roboctl/pkg-descr index cca3234ad751..1f9e4dcb9bf1 100644 --- a/devel/roboctl/pkg-descr +++ b/devel/roboctl/pkg-descr @@ -4,4 +4,4 @@ and other data to the controller, examine various robot states such 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 diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index fab629249306..f4f5d0fb01c0 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -8,7 +8,7 @@ CATEGORIES= graphics MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION} MAINTAINER= pav@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> diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile index 20d6b7ee1fb3..5f50f43f05d0 100644 --- a/graphics/lprof-devel/Makefile +++ b/graphics/lprof-devel/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: lprof -# Date created: 09 Jan 2008 -# Whom: Dmitry Marakasov <amdmi3@amdmi3.ru> -# +# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru> # $FreeBSD$ -# PORTNAME= lprof PORTVERSION= 20080514 @@ -31,12 +27,6 @@ CMAKE_ARGS= -DQTTRANS_LRELEASE_EXECUTABLE="${LOCALBASE}/bin/lrelease-qt4" 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> diff --git a/graphics/multican/Makefile b/graphics/multican/Makefile index 50b36d6101c6..51ed89a42d7f 100644 --- a/graphics/multican/Makefile +++ b/graphics/multican/Makefile @@ -20,13 +20,7 @@ PLIST_FILES= bin/multican lib/libmultican.so.0 lib/libmultican.so \ 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 +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e 's|endian.h|sys/&|' ${WRKSRC}/canonio.c \ @@ -43,4 +37,4 @@ post-install: ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/sane-epkowa/Makefile b/graphics/sane-epkowa/Makefile index 9644d24f5088..bf10dd16b15c 100644 --- a/graphics/sane-epkowa/Makefile +++ b/graphics/sane-epkowa/Makefile @@ -1,9 +1,7 @@ -# New ports collection makefile for: epkowa -# Date created: Dec.23, 2008 -# Whom: luigi@FreeBSD.org -# -# Maintainers: Luigi Rizzo <luigi@FreeBSD.org> +# Created by: luigi@FreeBSD.org # $FreeBSD$ + +# Maintainers: Luigi Rizzo <luigi@FreeBSD.org> # # This port builds version 2.11.0 of the sane-epkowa driver for SANE. # (more recent versions do not work - read details below). @@ -61,7 +59,6 @@ MAN5= sane-epkowa.5 # We use LIB_DEPENDS, but the dependency is also at build time LIB_DEPENDS+= ltdl:${PORTSDIR}/devel/libltdl -LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb LIB_DEPENDS+= getline:${PORTSDIR}/devel/libgetline LIB_DEPENDS+= sane.1:${PORTSDIR}/graphics/sane-backends diff --git a/graphics/sane-epkowa/pkg-descr b/graphics/sane-epkowa/pkg-descr index 93fb96d520a4..a13f89aac876 100644 --- a/graphics/sane-epkowa/pkg-descr +++ b/graphics/sane-epkowa/pkg-descr @@ -4,4 +4,4 @@ This backend supports many more devices than the sane-epson included in graphics/sane-backends, including new multifunction devices such as the SX400. -http://avasys.jp/english/ +WWW: http://avasys.jp/english/ diff --git a/net-mgmt/spectools/Makefile b/net-mgmt/spectools/Makefile index 8c10a9ef9419..9add207a7833 100644 --- a/net-mgmt/spectools/Makefile +++ b/net-mgmt/spectools/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: spectools -# Date created: 09 Oct 2007 -# Whom: Henrik Brix Andersen <henrik@brixandersen.dk> -# +# Created by: Henrik Brix Andersen <henrik@brixandersen.dk> # $FreeBSD$ -# PORTNAME= spectools PORTVERSION= 201004.r1 @@ -18,6 +14,7 @@ MAINTAINER= brix@FreeBSD.org COMMENT= Tools for the Wi-Spy spectrum analyzers from MetaGeek LLC LICENSE= GPLv2 + GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -25,14 +22,14 @@ USE_GMAKE= yes PORTDOCS= README -OPTIONS= GTK "Enable graphical client" On \ - NCURSES "Enable ncurses client" On +OPTIONS_DEFINE= GTK2 NCURSES +OPTIONS_DEFAULT= GTK2 NCURSES ALL_TARGET= spectool_net spectool_raw .include <bsd.port.options.mk> -.if defined(WITH_GTK) +.if ${PORT_OPTIONS:MGTK2} ALL_TARGET+= spectool_gtk LIB_DEPENDS+= gtk:${PORTSDIR}/x11-toolkits/gtk20 PLIST_SUB+= GTK="" @@ -40,7 +37,7 @@ PLIST_SUB+= GTK="" PLIST_SUB+= GTK="@comment " .endif -.if defined(WITH_NCURSES) +.if ${PORT_OPTIONS:MNCURSES} ALL_TARGET+= spectool_curses PLIST_SUB+= NCURSES="" .else @@ -49,33 +46,25 @@ PLIST_SUB+= NCURSES="@comment " .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb -.endif - .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -.if ${OSVERSION} > 800000 BROKEN= Does not build: duplicate definition of malloc -.else -BROKEN= Does not compile: fails to build wispy_hw_dbx.c -.endif .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/spectool_net ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/spectool_raw ${PREFIX}/bin -.if defined(WITH_GTK) +.if ${PORT_OPTIONS:MGTK2} ${INSTALL_PROGRAM} ${WRKSRC}/spectool_gtk ${PREFIX}/bin .endif -.if defined(WITH_NCURSES) +.if ${PORT_OPTIONS:MNCURSES} ${INSTALL_PROGRAM} ${WRKSRC}/spectool_curses ${PREFIX}/bin .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile index 2226c7d3154b..9e6b8477816b 100644 --- a/palm/pilot-link/Makefile +++ b/palm/pilot-link/Makefile @@ -32,9 +32,6 @@ CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS .endif .if ${PORT_OPTIONS:MUSB} -. if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb -. endif CONFIGURE_ARGS+=--enable-libusb LDFLAGS+= -L${PREFIX}/lib -lusb diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 836ccf2281ec..232e340d3f72 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -7,14 +7,16 @@ DISTVERSIONSUFFIX= -source CATEGORIES= print MASTER_SITES= EASYSW/${PORTNAME}/${DISTVERSION} PKGNAMESUFFIX= ${CUPS_SUFFIX}${PKGNAMESUFFIX2} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MAINTAINER= c.petrik.sosa@gmail.com COMMENT= Common UNIX Printing System: ${COMMENT2} LICENSE= GPLv2 + CONFLICTS= LPRng-[0-9]* +UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} + USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -122,7 +124,7 @@ CONFIGURE_ARGS+= --with-printcap=/etc/printcap PLIST_SUB+= OVERWRITE="@comment " CONFIGURE_ARGS+= --with-printcap=${PREFIX}/etc/printcap .endif - + .if ${PORT_OPTIONS:MGNUTLS} CONFIGURE_ARGS+= --disable-openssl --enable-gnutls LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt @@ -146,7 +148,7 @@ PLIST_SUB+= PHP="@comment " .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MGHOSTSCRIPT} .if ${PORT_OPTIONS:MXPDF} -IGNORE= You must select one and only one option to build pdftops +IGNORE= you must select one and only one option to build pdftops .endif USE_GHOSTSCRIPT= yes CONFIGURE_ARGS+= --enable-pdftops --with-pdftops=${LOCALBASE}/bin/gs @@ -173,7 +175,7 @@ LIB_DEPENDS+= paper:${PORTSDIR}/print/libpaper .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MMDNSRESPONDER} .if ${PORT_OPTIONS:MAVAHI} -IGNORE= You must select one and only one option to build for Zeroconf +IGNORE= you must select one and only one option to build for Zeroconf .endif LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder CONFIGURE_ARGS+= --with-dnssd-includes=${LOCALBASE}/include @@ -217,17 +219,13 @@ PLIST_SUB+= WITH_DBUS="@comment " RUN_DEPENDS+= xdg-open:${PORTSDIR}/devel/xdg-utils .endif -.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBUSB} && ${OSVERSION}>800062 +.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBUSB} CPPFLAGS+= -I/usr/include LDFLAGS+= -L/usr/lib -.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBUSB} && ${OSVERSION}<800063 -LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb .else CONFIGURE_ARGS+= --disable-libusb .endif -.if ${OSVERSION} >= 800000 CONFIGURE_ARGS+= LIBS="-lssp_nonshared" -.endif .if defined(CUPS_CLIENT) MAN1= cups-config.1 diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 8027193162df..c0f440632161 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -85,16 +85,7 @@ XSANE_DESC= Install XSane for scanning (requires SCAN) .include <bsd.port.options.mk> -.if ${OSVERSION} < 800067 -EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-strnlen -.endif - -.if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb -USB_INCLUDE= ${LOCALBASE}/include -.else USB_INCLUDE= /usr/include -.endif .if ${PORT_OPTIONS:MQT} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \ diff --git a/security/bsp_upektfmess/Makefile b/security/bsp_upektfmess/Makefile index f168d6ea34e5..5a84dd9544e8 100644 --- a/security/bsp_upektfmess/Makefile +++ b/security/bsp_upektfmess/Makefile @@ -12,8 +12,7 @@ DISTNAME= TFMESS_BSP_FreeBSD_1.1 MAINTAINER= ports@FreeBSD.org COMMENT= UPEK TouchChip TFM/ESS Fingerprint BSP -LIB_DEPENDS= bioapi100.0:${PORTSDIR}/security/bioapi \ - usb-0.1.8:${PORTSDIR}/devel/libusb +LIB_DEPENDS= bioapi100.0:${PORTSDIR}/security/bioapi RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext PLIST_FILES= lib/libtfmessbsp.so diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 14144f613bb9..b156fdc713b1 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -29,15 +29,6 @@ GNU_CONFIGURE= YES USES= iconv USE_LDCONFIG= YES CONFIGURE_ARGS+= --enable-symcryptrun -.if defined(NOPORTDOCS) -CONFIGURE_ARGS+= --disable-doc -.else -MAN1= gpg2.1 gpgsm.1 gpgv2.1 gpg-agent.1 scdaemon.1 watchgnupg.1 \ - gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 \ - gpgparsemail.1 symcryptrun.1 gpgsm-gencert.sh.1 -MAN8= addgnupghome.8 applygnupgdefaults.8 -INFO= gnupg -.endif OPTIONS_DEFINE= PINENTRY LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS PINENTRY_DESC= Use pinentry @@ -52,6 +43,16 @@ NO_OPTIONS_SORT= YES .include <bsd.port.options.mk> +.if ! ${PORT_OPTIONS:MDOCS} +CONFIGURE_ARGS+= --disable-doc +.else +MAN1= gpg2.1 gpgsm.1 gpgv2.1 gpg-agent.1 scdaemon.1 watchgnupg.1 \ + gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 \ + gpgparsemail.1 symcryptrun.1 gpgsm-gencert.sh.1 +MAN8= addgnupghome.8 applygnupgdefaults.8 +INFO= gnupg +.endif + .if ${PORT_OPTIONS:MPINENTRY} RUN_DEPENDS+= pinentry>0:${PORTSDIR}/security/pinentry .endif @@ -97,9 +98,6 @@ PLIST_SUB+= NLS="@comment " .if ${PORT_OPTIONS:MSCDAEMON} CONFIGURE_ARGS+=--enable-scdaemon -. if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb -. endif PLIST_SUB+= SCDAEMON="" .else CONFIGURE_ARGS+=--disable-scdaemon diff --git a/security/ykpers/Makefile b/security/ykpers/Makefile index 3592bac2ac11..a65dea5a4fd8 100644 --- a/security/ykpers/Makefile +++ b/security/ykpers/Makefile @@ -39,13 +39,7 @@ PROJECTHOST= yubikey-personalization MAKE_JOBS_UNSAFE=yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 800069 LDFLAGS+= -L/usr/lib -.else -LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb -.endif post-patch: @${REINPLACE_CMD} -e 's|^pkgconfigdir = .*|pkgconfigdir = /usr/local/libdata/pkgconfig|g' \ @@ -54,4 +48,4 @@ post-patch: regression-test: build @(cd ${WRKSRC}; ${MAKE} check) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile index 6658081a8f6d..b1a611527440 100644 --- a/sysutils/asusoled/Makefile +++ b/sysutils/asusoled/Makefile @@ -1,9 +1,5 @@ -# Ports collection makefile for: asusoled -# Date created: 2008-09-11 -# Whom: Jung-uk Kim <jkim@FreeBSD.org> -# +# Created by: Jung-uk Kim <jkim@FreeBSD.org> # $FreeBSD$ -# PORTNAME= asusoled PORTVERSION= 0.10 @@ -29,11 +25,7 @@ MAKE_ARGS+= TTF_FONT=${FONTDIR}/TTF/luxisr.ttf FONTDIR?= ${LOCALBASE}/lib/X11/fonts -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb -.endif +.include <bsd.port.options.mk> post-install: .if !defined(NOPORTDATA) @@ -42,7 +34,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/data/${i} ${DATADIR} .endfor .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${CAT} ${PKGMESSAGE} > ${WRKSRC}/README.FreeBSD @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} @@ -53,4 +45,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile index a2627973b702..89ad90b58f9d 100644 --- a/sysutils/lcdproc/Makefile +++ b/sysutils/lcdproc/Makefile @@ -7,7 +7,7 @@ CATEGORIES= sysutils MASTER_SITES= SF MAINTAINER= bsdfan@nurfuerspam.de -COMMENT= A client/server suite for LCD devices +COMMENT= Client/server suite for LCD devices LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -77,12 +77,7 @@ LCDPROC_DRIVERS=bayrad \ .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MUSB} -. if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb -CONFIGURE_ARGS+= --with-libusb -. else CONFIGURE_ARGS+= --with-libusb=/usr -. endif PLIST_SUB+= USB="" LCDPROC_DRIVERS+=IOWarrior \ picolcd \ diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index a27437f344be..c95c4679ed07 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: nut -# Date created: 08 Jan 2000 -# Whom: Boris Popov <bp@freebsd.org> -# +# Created by: Boris Popov <bp@freebsd.org> # $FreeBSD$ -# PORTNAME= nut PORTVERSION= 2.6.5 @@ -61,7 +57,7 @@ MAN8= nut-recorder.8 nut-scanner.8 nutupsdrv.8 upsc.8 \ PORTDOCS= * -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --program-transform-name="" \ @@ -110,11 +106,7 @@ PLIST_SUB+= NUT_SERIAL="@comment " .endif .if ${PORT_OPTIONS:MUSB} -. if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb -. else #EXTRA_PATCHES= ${FILESDIR}/extra-patch-m4_nut_check_libusb.m4 -. endif CONFIGURE_ARGS+= --with-usb=auto MAN8+= bcmxcp_usb.8 richcomm_usb.8 tripplite_usb.8 usbhid-ups.8 PLIST_SUB+= NUT_USB="" @@ -185,7 +177,7 @@ pre-install: @${CHOWN} ${NUT_USER}:${NUT_GROUP} ${STATEDIR} @${CHMOD} 0750 ${STATEDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: .if ${PORT_OPTIONS:MBASH} @${MKDIR} ${PREFIX}/etc/bash_completion.d/ @@ -200,4 +192,4 @@ post-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/scanbuttond/Makefile b/sysutils/scanbuttond/Makefile index 5bb62ed388f6..504da924f0a9 100644 --- a/sysutils/scanbuttond/Makefile +++ b/sysutils/scanbuttond/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: scanbuttond -# Date created: 31 March 2006 -# Whom: Daniel Thiele -# +# Created by: Daniel Thiele # $FreeBSD$ -# PORTNAME= scanbuttond PORTVERSION= 0.2.3 @@ -12,7 +8,7 @@ CATEGORIES= sysutils MASTER_SITES= SF MAINTAINER= dthiele@gmx.net -COMMENT= A daemon to monitor and configure modern scanner's buttons +COMMENT= Daemon to monitor and configure modern scanner's buttons LICENSE= GPLv2 @@ -24,12 +20,6 @@ MAKE_JOBS_SAFE= yes SUB_FILES+= pkg-message -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb -.endif - pre-configure: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ ${REINPLACE_CMD} -e 's|-ldl||g' @@ -52,4 +42,4 @@ post-install: done @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/scanbuttond/pkg-descr b/sysutils/scanbuttond/pkg-descr index e699ae71061b..2130dbb8f6b0 100644 --- a/sysutils/scanbuttond/pkg-descr +++ b/sysutils/scanbuttond/pkg-descr @@ -8,4 +8,4 @@ the button number as an argument. The supported scanner backends currently are: epson, niash, plustek, snapscan Author: Bernhard Stiftner <root84@users.sourceforge.net> -WWW: http://scanbuttond.sourceforge.net/ +WWW: http://scanbuttond.sourceforge.net/ diff --git a/sysutils/usbutils/Makefile b/sysutils/usbutils/Makefile index c45549998585..b78a21a4b100 100644 --- a/sysutils/usbutils/Makefile +++ b/sysutils/usbutils/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: usbutils -# Date created: 14 Nov 2007 -# Whom: Henrik Brix Andersen <brix@FreeBSD.org> -# +# Created by: Henrik Brix Andersen <brix@FreeBSD.org> # $FreeBSD$ PORTNAME= usbutils @@ -14,6 +11,7 @@ MAINTAINER= brix@FreeBSD.org COMMENT= Utility for listing USB devices LICENSE= GPLv2 + GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -25,14 +23,10 @@ MAN1= usb-devices.1 MAN8= lsusb.8 PORTDOCS= AUTHORS ChangeLog NEWS README -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb -.else CONFIGURE_ENV+= LIBUSB_CFLAGS="-I/usr/include" \ LIBUSB_LIBS="-L/usr/lib -lusb" -.endif post-patch: @${REINPLACE_CMD} -i '' \ @@ -40,9 +34,9 @@ post-patch: ${WRKSRC}/usb-devices 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> diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 30b772221786..697994a71f51 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -124,10 +124,6 @@ RUN_DEPENDS+= ${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:${PORTSDIR} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800069 -LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb -.endif - .if ${OSVERSION} < 900004 LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter .endif |