diff options
| -rw-r--r-- | java/java-rxtx/0000-configure-java-version.patch | 93 | ||||
| -rw-r--r-- | java/java-rxtx/0001-makefile-destdir.patch | 21 | ||||
| -rw-r--r-- | java/java-rxtx/0002-makefile-javadoc-dir.patch | 13 | ||||
| -rw-r--r-- | java/java-rxtx/0003-lockdir-location.patch | 18 | ||||
| -rw-r--r-- | java/java-rxtx/GroupMembership.txt | 7 | ||||
| -rw-r--r-- | java/java-rxtx/PKGBUILD | 95 |
6 files changed, 0 insertions, 247 deletions
diff --git a/java/java-rxtx/0000-configure-java-version.patch b/java/java-rxtx/0000-configure-java-version.patch deleted file mode 100644 index c9e37258a..000000000 --- a/java/java-rxtx/0000-configure-java-version.patch +++ /dev/null @@ -1,93 +0,0 @@ -Make the JAVA_VERSION checks future-proof (for Java 6 and 7) - -At this point Java is mature enough that support for older versions isn't -going to be dropped, so instead of having a growing list of new versions that -work by default, have a short list of old versions that need special measures. ---- RXTX.orig/configure.in 2012-10-29 01:13:58.000000000 -0400 -+++ RXTX/configure.in 2012-10-29 10:56:18.000000000 -0400 -@@ -463,12 +463,6 @@ - CFLAGS=$CFLAGS" -D__need_timespec" - case $JAVA_VERSION in - -- 1.2*|1.3*|1.4*|1.5*) -- #fix_parameters $JPATH/jre/lib/javax.comm.properties -- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` -- JHOME=$JPATH"/jre/lib/ext" -- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" -- ;; - 1.1*) - CLASSPATH=".:\$(TOP):\$(TOP)/src:"` \ - if [ -d $JPATH/share/kaffe/ ]; then -@@ -498,6 +492,12 @@ - JHOME=$JPATH/"lib" - fi - ;; -+ *) -+ #fix_parameters $JPATH/jre/lib/javax.comm.properties -+ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` -+ JHOME=$JPATH"/jre/lib/ext" -+ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" -+ ;; - esac - - # Cross Compilers -@@ -533,12 +533,6 @@ - TARGETLIB="\$(target_triplet)/librxtxSerial.la \ - \$(target_triplet)/librxtxParallel.la" - case $JAVA_VERSION in -- 1.2*|1.3*|1.4*|1.5*) -- #fix_parameters $JPATH/jre/lib/javax.comm.properties -- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` -- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" -- JHOME=$JPATH/"jre/lib/ext" -- ;; - 1.1*) - check_prefix - #fix_parameters $JPATH/lib/javax.comm.properties -@@ -570,6 +564,10 @@ - JHOME=$JPATH/"lib" - ;; - *) -+ #fix_parameters $JPATH/jre/lib/javax.comm.properties -+ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` -+ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" -+ JHOME=$JPATH/"jre/lib/ext" - ;; - esac - ;; -@@ -669,15 +667,15 @@ - - WIN32) - case $JAVA_VERSION in -- 1.2*|1.3*|1.4*|1.5*) -- CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH" -- JHOME=$JPATH"/jre/lib/ext" -- ;; - 1.1*) - CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH" - RXTX_PATH="\$(prefix)/lib/" - JHOME=$JPATH/"lib" - ;; -+ *) -+ CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH" -+ JHOME=$JPATH"/jre/lib/ext" -+ ;; - esac - if test x$WIN32INCLUDE = x; then - echo "We need to know what directory the windows java include files" -@@ -721,12 +719,12 @@ - CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH" - - case $JAVA_VERSION in -- 1.2*|1.3*|1.4*|1.5*) -- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" -- ;; - 1.1*) - RXTX_PATH="\$(JPATH)/lib/" - ;; -+ *) -+ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" -+ ;; - esac - ;; - diff --git a/java/java-rxtx/0001-makefile-destdir.patch b/java/java-rxtx/0001-makefile-destdir.patch deleted file mode 100644 index 944654ab6..000000000 --- a/java/java-rxtx/0001-makefile-destdir.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add DESTDIR support to Makefile ---- RXTX.orig/Makefile.am -+++ RXTX/Makefile.am -@@ -81,13 +81,15 @@ - # install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its - # proper location - install: all -+ $(mkinstalldirs) $(DESTDIR)$(RXTX_PATH) -+ $(mkinstalldirs) $(DESTDIR)$(JHOME) - @$(LIBTOOL_INST) \ - `for i in $(TARGETLIB);do \ - if [ -f $$i ];then \ - echo $$i; \ - fi; \ -- done` $(RXTX_PATH) -- $(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/ -+ done` $(DESTDIR)$(RXTX_PATH) -+ $(INSTALL_PROGRAM) $(JARTARGET) $(DESTDIR)$(JHOME)/ - - clean-generic: - rm -rf $(DEST) $(TOP)/$(CLASSTOP) diff --git a/java/java-rxtx/0002-makefile-javadoc-dir.patch b/java/java-rxtx/0002-makefile-javadoc-dir.patch deleted file mode 100644 index 9b4eb0692..000000000 --- a/java/java-rxtx/0002-makefile-javadoc-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Place the Javadoc output in its own directory ---- RXTX.orig/Makefile.am -+++ RXTX/Makefile.am -@@ -99,7 +99,8 @@ - - # create the javadoc files. - docs: $(CLASSES) -- $(JAVADOC) $(javafiles) -+ mkdir javadoc -+ cd javadoc && $(JAVADOC) $(javafiles) - - ################ WIN32 CrossCompiling from here down ####################### - diff --git a/java/java-rxtx/0003-lockdir-location.patch b/java/java-rxtx/0003-lockdir-location.patch deleted file mode 100644 index 0278add4e..000000000 --- a/java/java-rxtx/0003-lockdir-location.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix the location of device lock files. - -Use the new semi-standard device lock file directory on GNU/Linux. This is -nescessary on (at least) Arch Linux and Parabola GNU/Linux. - -http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html - ---- RXTX.orig/src/SerialImp.h -+++ RXTX/src/SerialImp.h -@@ -109,7 +109,7 @@ - /* Ports known on the OS */ - #if defined(__linux__) - # define DEVICEDIR "/dev/" --# define LOCKDIR "/var/lock" -+# define LOCKDIR "/run/lock/lockdev" - # define LOCKFILEPREFIX "LCK.." - # define FHS - #endif /* __linux__ */ diff --git a/java/java-rxtx/GroupMembership.txt b/java/java-rxtx/GroupMembership.txt deleted file mode 100644 index fef1ef349..000000000 --- a/java/java-rxtx/GroupMembership.txt +++ /dev/null @@ -1,7 +0,0 @@ -In order to use a program that makes use of rxtx, you must be a member -of the groups: - * uucp: for access to hardware devices in /dev - * lock: for access to hardware lockfiles in /run/lock/lockdev - -Most documentation indicates that you must be in one or the other, -depending on your distro; you must actually be in both. diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD deleted file mode 100644 index 1d247a802..000000000 --- a/java/java-rxtx/PKGBUILD +++ /dev/null @@ -1,95 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -_pkgver=2.1-7r2-arduino4 -_gitver='commit=a8cd90f8505d7c472b57550b1192fe67885dd638' - -#### - -pkgname=java-rxtx -pkgver=${_pkgver//-/.} -pkgdesc="A native library providing serial and parallel communication for Java" -license=(LGPL2.1) - -pkgrel=4 -arch=('i686' 'x86_64' 'mips64el') -depends=('java-runtime') -makedepends=('java-environment') - -case "$_pkgver" in - *arduino*) - url="https://github.com/arduino/RXTX" - source=("libre://RXTX-$pkgver.tar.gz") - md5sums=('f083d5a17878ccf4a25347f23d43c17b') - mksource=("git://github.com/arduino/RXTX.git#${_gitver}") - mkmd5sums=('SKIP') - _dirname=RXTX - ;; - *) - url="http://rxtx.qbang.org/" - source=("http://rxtx.qbang.org/pub/rxtx/rxtx-${_pkgver}.zip") - md5sums=('9290b4832d46199f8d798a531209640b') - _dirname=rxtx-{$_pkgver} - ;; -esac - -source+=( - 0000-configure-java-version.patch - 0001-makefile-destdir.patch - 0002-makefile-javadoc-dir.patch - 0003-lockdir-location.patch - GroupMembership.txt) - -md5sums+=('a36caaca717018341d69605f962d1c2a' - '39c88043032de742c6b51d90a26eee2c' - 'a910e0c75a9c687d2b2f782e3d9982e3' - '33ece2602aed350a449e922b5465ea22' - '1c888e587298bcaf2b562f95bc62a9ad') - -_MAKEFLAGS=('JHOME=/usr/share/java' 'RXTX_PATH=/usr/lib') - -_changelog() { - t="`echo -e '\t'`" - - # Parabola changes - ls "$srcdir"/*.patch | sort -r | while read file; do - echo "${file##*/}" - sed "1s/./$t$t&/;1q" "$file" - done - - # Arduino changes - if [[ -d "$srcdir/$_dirname/.git" ]]; then - pushd "$srcdir/$_dirname" > /dev/null - git log --pretty=format:"%h %ad%n$t$t%s" --date=short|head -n-2 - popd > /dev/null - fi - - # RXTX ChangeLog - grep "^[0-9 $t]" "$srcdir/$_dirname/ChangeLog" -} - -build() { - _changelog > "$srcdir/ChangeLog.txt" - cd "$srcdir/$_dirname" - . /etc/profile.d/jdk.sh - - patch -Np1 -i "$srcdir/0000-configure-java-version.patch" # requires autogen - patch -Np1 -i "$srcdir/0001-makefile-destdir.patch" # requires autogen - patch -Np1 -i "$srcdir/0002-makefile-javadoc-dir.patch" # requires autogen - patch -Np1 -i "$srcdir/0003-lockdir-location.patch" - rm *.m4 && ./autogen.sh - - ./configure --prefix=/usr - make "${_MAKEFLAGS[@]}" all docs -} - -package() { - cd "$srcdir/$_dirname" - . /etc/profile.d/jdk.sh - - make "${_MAKEFLAGS[@]}" DESTDIR="$pkgdir" install - - install -d "$pkgdir/usr/share/doc/$pkgname/" - install -m644 "$srcdir/ChangeLog.txt" "$pkgdir/usr/share/doc/$pkgname/" - install -m644 "$srcdir/GroupMembership.txt" "$pkgdir/usr/share/doc/$pkgname/" - cp -r javadoc "$pkgdir/usr/share/doc/$pkgname/" -} |