Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Oct 2014 17:40:44 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r370195 - head/devel/libsigrokdecode
Message-ID:  <201410061740.s96HeiHa007028@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Mon Oct  6 17:40:43 2014
New Revision: 370195
URL: https://svnweb.freebsd.org/changeset/ports/370195
QAT: https://qat.redports.org/buildarchive/r370195/

Log:
  Unbreak on head and 10.1

Modified:
  head/devel/libsigrokdecode/Makefile
  head/devel/libsigrokdecode/pkg-plist

Modified: head/devel/libsigrokdecode/Makefile
==============================================================================
--- head/devel/libsigrokdecode/Makefile	Mon Oct  6 17:06:13 2014	(r370194)
+++ head/devel/libsigrokdecode/Makefile	Mon Oct  6 17:40:43 2014	(r370195)
@@ -11,17 +11,18 @@ COMMENT=	Framework for hardware logic an
 
 LICENSE=	GPLv3
 
-USE_PYTHON=	3
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
-USES=		gmake pathfix libtool pkgconfig
+USES=		gmake libtool pathfix pkgconfig python:3
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
+
+.include <bsd.port.pre.mk>
 
 # Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION
+.if (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100029) || (${OSVERSION} < 1000715)
 CFLAGS+=	-DLIBUSB_CLASS_APPLICATION=0xfe
+.endif
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsigrokdecode.so
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/libsigrokdecode/pkg-plist
==============================================================================
--- head/devel/libsigrokdecode/pkg-plist	Mon Oct  6 17:06:13 2014	(r370194)
+++ head/devel/libsigrokdecode/pkg-plist	Mon Oct  6 17:40:43 2014	(r370195)
@@ -82,42 +82,3 @@ libdata/pkgconfig/libsigrokdecode.pc
 %%DATADIR%%/decoders/z80/__init__.py
 %%DATADIR%%/decoders/z80/pd.py
 %%DATADIR%%/decoders/z80/tables.py
-@dirrmtry include/libsigrokdecode
-@dirrmtry %%DATADIR%%/decoders/avr_isp
-@dirrmtry %%DATADIR%%/decoders/can
-@dirrmtry %%DATADIR%%/decoders/dcf77
-@dirrmtry %%DATADIR%%/decoders/ds1307
-@dirrmtry %%DATADIR%%/decoders/edid
-@dirrmtry %%DATADIR%%/decoders/guess_bitrate
-@dirrmtry %%DATADIR%%/decoders/i2c
-@dirrmtry %%DATADIR%%/decoders/i2cdemux
-@dirrmtry %%DATADIR%%/decoders/i2cfilter
-@dirrmtry %%DATADIR%%/decoders/i2s
-@dirrmtry %%DATADIR%%/decoders/ir_nec
-@dirrmtry %%DATADIR%%/decoders/ir_rc5
-@dirrmtry %%DATADIR%%/decoders/jtag
-@dirrmtry %%DATADIR%%/decoders/jtag_stm32
-@dirrmtry %%DATADIR%%/decoders/lm75
-@dirrmtry %%DATADIR%%/decoders/lpc
-@dirrmtry %%DATADIR%%/decoders/maxim_ds28ea00
-@dirrmtry %%DATADIR%%/decoders/midi
-@dirrmtry %%DATADIR%%/decoders/mlx90614
-@dirrmtry %%DATADIR%%/decoders/mx25lxx05d
-@dirrmtry %%DATADIR%%/decoders/mxc6225xu
-@dirrmtry %%DATADIR%%/decoders/nunchuk
-@dirrmtry %%DATADIR%%/decoders/onewire_link
-@dirrmtry %%DATADIR%%/decoders/onewire_network
-@dirrmtry %%DATADIR%%/decoders/pan1321
-@dirrmtry %%DATADIR%%/decoders/parallel
-@dirrmtry %%DATADIR%%/decoders/rgb_led_spi
-@dirrmtry %%DATADIR%%/decoders/rtc8564
-@dirrmtry %%DATADIR%%/decoders/sdcard_spi
-@dirrmtry %%DATADIR%%/decoders/spi
-@dirrmtry %%DATADIR%%/decoders/tlc5620
-@dirrmtry %%DATADIR%%/decoders/uart
-@dirrmtry %%DATADIR%%/decoders/usb_packet
-@dirrmtry %%DATADIR%%/decoders/usb_signalling
-@dirrmtry %%DATADIR%%/decoders/xfp
-@dirrmtry %%DATADIR%%/decoders/z80
-@dirrmtry %%DATADIR%%/decoders
-@dirrmtry %%DATADIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410061740.s96HeiHa007028>