Index: head/comms/java-simple-serial-connector/Makefile =================================================================== --- head/comms/java-simple-serial-connector/Makefile (revision 495536) +++ head/comms/java-simple-serial-connector/Makefile (revision 495537) @@ -1,47 +1,48 @@ # $FreeBSD$ PORTNAME= java-simple-serial-connector PORTVERSION= 2.8.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= comms java MAINTAINER= kevans@FreeBSD.org COMMENT= Library for working with serial ports from Java LICENSE= LGPL3 USE_GITHUB= yes GH_ACCOUNT= scream3r MAJOR_MINOR= ${PORTVERSION:C/(.*)\.[0-9]*/\\1/} USE_JAVA= yes USE_ANT= yes ALL_TARGET= dist CXXFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd WRKSRC_LIBS= ${WRKSRC}/src/java/libs PLIST_FILES= ${JAVA_HOME}/jre/lib/ext/jssc-${PORTVERSION}.jar .include .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 JSSC_ARCH= arm .else JSSC_ARCH= ${ARCH} .endif post-extract: @${CP} ${FILESDIR}/build.xml.in ${WRKSRC}/build.xml @${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${WRKSRC}/build.xml pre-build: ${RM} -r ${WRKSRC_LIBS}/* ${MKDIR} ${WRKSRC_LIBS}/freebsd (cd ${WRKSRC}/src/cpp/_nix_based && ${CXX} ${CXXFLAGS} ${CPPFLAGS} -shared -fPIC -o ${WRKSRC_LIBS}/freebsd/libjSSC-${MAJOR_MINOR}_${JSSC_ARCH}.so jssc.cpp) ${STRIP_CMD} ${WRKSRC_LIBS}/freebsd/libjSSC-${MAJOR_MINOR}_${JSSC_ARCH}.so do-install: @${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/ext ${CP} ${WRKSRC}/build/jssc-${PORTVERSION}.jar ${STAGEDIR}${JAVA_HOME}/jre/lib/ext .include Index: head/comms/java-simple-serial-connector/files/patch-src_java_jssc_SerialPortList.java =================================================================== --- head/comms/java-simple-serial-connector/files/patch-src_java_jssc_SerialPortList.java (revision 495536) +++ head/comms/java-simple-serial-connector/files/patch-src_java_jssc_SerialPortList.java (revision 495537) @@ -1,14 +1,14 @@ --- src/java/jssc/SerialPortList.java.orig 2016-10-24 19:46:27 UTC +++ src/java/jssc/SerialPortList.java @@ -57,6 +57,11 @@ public class SerialPortList { PORTNAMES_PATH = "/dev/"; break; } -+ case SerialNativeInterface.OS_FREEBSD: { -+ PORTNAMES_REGEXP = Pattern.compile("cuaU[0-9]{1,3}"); -+ PORTNAMES_PATH = "/dev/"; -+ break; -+ } ++ case SerialNativeInterface.OS_FREEBSD: { ++ PORTNAMES_REGEXP = Pattern.compile("cuaU[0-9]{1,3}$"); ++ PORTNAMES_PATH = "/dev/"; ++ break; ++ } case SerialNativeInterface.OS_WINDOWS: { PORTNAMES_REGEXP = Pattern.compile(""); PORTNAMES_PATH = ""; Index: head/devel/arduino-core/distinfo =================================================================== --- head/devel/arduino-core/distinfo (revision 495536) +++ head/devel/arduino-core/distinfo (revision 495537) @@ -1,7 +1,7 @@ -TIMESTAMP = 1490895941 -SHA256 (arduino/arduino-Arduino-1.6.18-b439a77_GH0.tar.gz) = ded6eebe1b58834df432e8d49f01a8c1aeb1328479f244075db7f76c12019f37 -SIZE (arduino/arduino-Arduino-1.6.18-b439a77_GH0.tar.gz) = 48187661 +TIMESTAMP = 1552437121 +SHA256 (arduino/arduino-Arduino-1.6.18-b439a77_GH0.tar.gz) = 70191e9badd0986b697326d4640da1d24090f0c72a7e8c8f783bcb1ca63121a4 +SIZE (arduino/arduino-Arduino-1.6.18-b439a77_GH0.tar.gz) = 48187647 SHA256 (arduino/arduino-ArduinoCore-sam-fc57f2e_GH0.tar.gz) = 3d374e7c7037d317f5da73c95361033b81e6cc12330a7623b20ad2f084bff247 SIZE (arduino/arduino-ArduinoCore-sam-fc57f2e_GH0.tar.gz) = 38839710 -SHA256 (arduino/arduino-ArduinoCore-samd-1.6.12_GH0.tar.gz) = fefa0cb0871033451aa0ea08b6a9b4587acdd800b6064a9d47233be7b6368ce8 -SIZE (arduino/arduino-ArduinoCore-samd-1.6.12_GH0.tar.gz) = 3321356 +SHA256 (arduino/arduino-ArduinoCore-samd-1.6.12_GH0.tar.gz) = 24527ad183696357be6c97ce8da1c777f9664266452d6ad717b2ec582f08def3 +SIZE (arduino/arduino-ArduinoCore-samd-1.6.12_GH0.tar.gz) = 3323979 Index: head/devel/arduino18/Makefile =================================================================== --- head/devel/arduino18/Makefile (revision 495536) +++ head/devel/arduino18/Makefile (revision 495537) @@ -1,111 +1,112 @@ # $FreeBSD$ PORTNAME= arduino PORTVERSION= 1.8.5 +PORTREVISION= 1 CATEGORIES= devel java PKGNAMESUFFIX= 18 DIST_SUBDIR= ${PORTNAME} MAINTAINER= kevans@FreeBSD.org COMMENT= Open-source electronics prototyping platform LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../license.txt LIB_DEPENDS= liblistSerialsj.so:devel/listserialc \ libastylej-arduino.so:devel/libastylej-arduino RUN_DEPENDS= arduino-builder:devel/arduino-builder \ arduino-tools>=1.6.12:devel/arduino-tools \ bash:shells/bash \ ${JAVA_HOME}/jre/lib/ext/jssc-2.8.0.jar:comms/java-simple-serial-connector CONFLICTS= arduino-[0-9]* BUNDLE_GH_ACCOUNT= arduino-libraries BUNDLE_LIBRARIES= Firmata:2.5.6:firmata \ Bridge:1.6.3:bridge \ Robot_Control:1.0.4:robotcontrol \ Robot_Motor:1.0.3:robotmotor \ RobotIRremote:2.0.0:robotir \ SpacebrewYun:1.0.1:spacebrew \ Temboo:1.2.1:temboo \ Esplora:1.0.4:esplora \ Mouse:1.0.1:mouse \ Keyboard:1.0.1:keyboard \ SD:1.1.1:sd \ Servo:1.1.2:servo \ LiquidCrystal:1.0.7:liquidcrystal GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.9.2:wifi10/linux/work/tools/WiFi101 USE_GITHUB= yes GH_ACCOUNT= arduino GH_PROJECT= Arduino .for blib in ${BUNDLE_LIBRARIES} GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:${blib}/linux/work/libraries/${blib:C/\:.*//} .endfor USES= desktop-file-utils LIB_DIRS+= ${LOCALBASE}/lib ${LOCALBASE}/lib/jni WRKSRC_SUBDIR= build PATCH_WRKSRC= ${WRKSRC}/../ MAKE_ARGS+= -Dlight_bundle=true -Dlocal_sources=true -Dno_arduino_builder=true USE_JAVA= yes JAVA_VERSION= 1.8+ USE_ANT= yes OS_DIR= ${WRKSRC}/linux BUILD_DIR= ${OS_DIR}/work INSLIST= lib libraries revisions.txt tools STRIP= # No Elfs here, only symlinks OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_SUB= yes DOCS_MAKE_ARGS= -Dno_docs=false DOCS_MAKE_ARGS_OFF= -Dno_docs=true DOCS_MASTER_SITES= http://downloads.arduino.cc/:ref,galileo,edison \ https://files.kyle-evans.net/arduino/:ref,galileo,edison DOCS_DISTFILES= reference-1.6.6-3.zip:ref \ Galileo_help_files-1.6.2.zip:galileo \ Edison_help_files-1.6.2.zip:edison .include .if ${PORT_OPTIONS:MDOCS} INSLIST+= reference .endif .if ${PORT_OPTIONS:MEXAMPLES} INSLIST+= examples .endif post-extract: ${MKDIR} ${BUILD_DIR}/reference ${MV} ${WRKDIR}/code.jquery.com ${BUILD_DIR}/reference ${MV} ${WRKDIR}/www.arduino.cc ${BUILD_DIR}/reference ${MV} ${WRKDIR}/Galileo_help_files ${BUILD_DIR}/reference ${MV} ${WRKDIR}/Edison_help_files ${BUILD_DIR}/reference post-patch: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${PATCH_WRKSRC}/arduino-core/src/processing/app/BaseNoGui.java ${REINPLACE_CMD} -e 's::arduino:' -e 's::arduino:' \ ${PATCH_WRKSRC}/build/linux/dist/desktop.template do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME} (cd ${BUILD_DIR}/ && ${COPYTREE_SHARE} "${INSLIST}" ${STAGEDIR}${PREFIX}/${PORTNAME} ${FIND_EXPR}) (cd ${WRKSRC}/../ && ${COPYTREE_SHARE} "libraries" ${STAGEDIR}${PREFIX}/${PORTNAME} ${FIND_EXPR}) ${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/libastylej.so ${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/liblistSerialsj.so ${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/jssc-2.8.0-arduino1.jar ${LN} -s ../../lib/jni/libastylej-arduino.so ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/libastylej.so ${LN} -s ../../lib/jni/liblistSerialsj.so ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/liblistSerialsj.so ${INSTALL_SCRIPT} ${BUILD_DIR}/arduino ${STAGEDIR}${PREFIX}/${PORTNAME} ${LN} -s ../${PORTNAME}/arduino ${STAGEDIR}${PREFIX}/bin/arduino ${LN} -s ../bin/arduino-builder ${STAGEDIR}${PREFIX}/arduino/arduino-builder ${CP} ${WRKSRC}/shared/icons/arduino.xpm ${STAGEDIR}/${PREFIX}/share/pixmaps ${CP} ${PATCH_WRKSRC}/build/linux/dist/desktop.template ${STAGEDIR}/${PREFIX}/share/applications/arduino.desktop ${REINPLACE_CMD} -e 's|$${version}|${PORTVERSION}|' ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/version.txt .include Index: head/devel/arduino18/files/patch-arduino-core_src_processing_app_SerialPortList.java =================================================================== --- head/devel/arduino18/files/patch-arduino-core_src_processing_app_SerialPortList.java (nonexistent) +++ head/devel/arduino18/files/patch-arduino-core_src_processing_app_SerialPortList.java (revision 495537) @@ -0,0 +1,14 @@ +--- arduino-core/src/processing/app/SerialPortList.java.orig 2019-03-12 21:32:52 UTC ++++ arduino-core/src/processing/app/SerialPortList.java +@@ -66,6 +66,11 @@ public class SerialPortList { + PORTNAMES_PATH = ""; + break; + } ++ case SerialNativeInterface.OS_FREEBSD: { ++ PORTNAMES_REGEXP = Pattern.compile("cuaU[0-9]{1,3}$"); ++ PORTNAMES_PATH = "/dev/"; ++ break; ++ } + default: { + PORTNAMES_REGEXP = null; + PORTNAMES_PATH = null; Property changes on: head/devel/arduino18/files/patch-arduino-core_src_processing_app_SerialPortList.java ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property