- Update to 4.16 [1]

- Use foo-[0-9]* for CONFLICTS

Submitted by:	"Thomas E. Zander" <riggs@rrr.de> (maintainer)
PR:		ports/92575

11 files changed, 80 insertions, 24 deletions

diff --git a/cad/linux-eagle/Makefile b/cad/linux-eagle/Makefile
index 697f8bf1ac34..73e0b8718a17 100644
--- a/cad/linux-eagle/Makefile
+++ b/cad/linux-eagle/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	linux-eagle
-EAGLEVERSION?=	4.15
+EAGLEVERSION?=	4.16
 EAGLELANG?=	eng
 PORTVERSION=	${EAGLEVERSION:S/r/./}
 CATEGORIES?=	cad linux
@@ -17,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER?=	riggs@rrr.de
 COMMENT?=	An easy to use, yet powerful tool for designing printed circuit boards
 
-CONFLICTS?=	de-linux-eagle-*
+CONFLICTS?=	de-linux-eagle-[0-9]*
 
 ONLY_FOR_ARCHS=	i386
 
@@ -39,8 +39,9 @@ do-install:
 	@${MKDIR} ${DATADIR}
 	@ cd ${WRKSRC} && ${FIND} * -type f -print | ${CPIO} ${BINOWN}:${BINGRP} ${DATADIR}
 	@ cd ${DATADIR} && ${FIND} * -type d -print | ${XARGS} ${CHMOD} 0755
-	@${LN} -sf ${DATADIR}/bin/eagle ${PREFIX}/bin/eagle
 	@${INSTALL_MAN} ${DATADIR}/man/eagle.1 ${PREFIX}/man/man1
+	@${SED} -e "s:%%DATADIR%%:${DATADIR}:g" ${FILESDIR}/eagle.sh > ${PREFIX}/bin/eagle
+	@${CHMOD} 0555 ${PREFIX}/bin/eagle
 
 post-install:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${PKGDIR}/pkg-message > \
diff --git a/cad/linux-eagle/distinfo b/cad/linux-eagle/distinfo
index 959080fba18a..16b8117a9ef2 100644
--- a/cad/linux-eagle/distinfo
+++ b/cad/linux-eagle/distinfo
@@ -1,3 +1,3 @@
-MD5 (eagle-lin-eng-4.15.tgz) = b9a3ec50033785903cfccba86de0b367
-SHA256 (eagle-lin-eng-4.15.tgz) = 39e82b906798802aef2a31dc711ad1055c1ae9c57f85e181b4800c9d3c6b87fd
-SIZE (eagle-lin-eng-4.15.tgz) = 8165519
+MD5 (eagle-lin-eng-4.16.tgz) = 99843bdfa22503cad5ddc3b0dbbb0d2d
+SHA256 (eagle-lin-eng-4.16.tgz) = 6e546223b9981d5e753f52d0104459dc9a89bf0fd5c19a30c7b12be56ad55225
+SIZE (eagle-lin-eng-4.16.tgz) = 8367197
diff --git a/cad/linux-eagle/files/eagle.sh b/cad/linux-eagle/files/eagle.sh
new file mode 100644
index 000000000000..893690f14bdb
--- /dev/null
+++ b/cad/linux-eagle/files/eagle.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+EAGLEBIN=%%DATADIR%%/bin/eagle
+
+$EAGLEBIN "$@"
diff --git a/cad/linux-eagle/pkg-plist b/cad/linux-eagle/pkg-plist
index a1d0ffa0957e..ca257aa24768 100644
--- a/cad/linux-eagle/pkg-plist
+++ b/cad/linux-eagle/pkg-plist
@@ -384,18 +384,21 @@ share/eagle/lbr/con-conrad.lbr
 share/eagle/lbr/con-deutsch.lbr
 share/eagle/lbr/con-dil.lbr
 share/eagle/lbr/con-erni.lbr
+share/eagle/lbr/con-faston.lbr
 share/eagle/lbr/con-friwo.lbr
 share/eagle/lbr/con-harting-h.lbr
 share/eagle/lbr/con-harting-ml.lbr
 share/eagle/lbr/con-harting-v.lbr
 share/eagle/lbr/con-harting.lbr
 share/eagle/lbr/con-hirschmann.lbr
+share/eagle/lbr/con-jack.lbr
 share/eagle/lbr/con-jst.lbr
 share/eagle/lbr/con-lsta.lbr
 share/eagle/lbr/con-lstb.lbr
 share/eagle/lbr/con-lumberg.lbr
 share/eagle/lbr/con-molex.lbr
 share/eagle/lbr/con-neutrik_ag.lbr
+share/eagle/lbr/con-omron.lbr
 share/eagle/lbr/con-panduit.lbr
 share/eagle/lbr/con-pc.lbr
 share/eagle/lbr/con-pc104.lbr
@@ -458,6 +461,7 @@ share/eagle/lbr/micro-intel.lbr
 share/eagle/lbr/micro-mc68000.lbr
 share/eagle/lbr/micro-motorola.lbr
 share/eagle/lbr/micro-philips.lbr
+share/eagle/lbr/micro-samsung.lbr
 share/eagle/lbr/micro-siemens.lbr
 share/eagle/lbr/microchip.lbr
 share/eagle/lbr/micronas.lbr
@@ -644,11 +648,19 @@ share/eagle/ulp/import-bmp.ulp
 share/eagle/ulp/import-ultiboard-ddf.ulp
 share/eagle/ulp/length-freq-ri.ulp
 share/eagle/ulp/length.ulp
+share/eagle/ulp/make_bga_package.bmp
+share/eagle/ulp/make_package_dual.bmp
+share/eagle/ulp/make_package_meass_pacinfo.bmp
+share/eagle/ulp/make_package_meass_padinfo.bmp
+share/eagle/ulp/make_package_quad_left.bmp
+share/eagle/ulp/make_package_quad_middle.bmp
 share/eagle/ulp/make-symbol-device-package-bsdl.ulp
 share/eagle/ulp/make_symbol_dual1.bmp
 share/eagle/ulp/make_symbol_dual2.bmp
 share/eagle/ulp/make_symbol_quad.bmp
 share/eagle/ulp/make_symbol_single.bmp
+share/eagle/ulp/microstrip-radial-stub.bmp
+share/eagle/ulp/microstrip-radial-stub.ulp
 share/eagle/ulp/mill-outlines-bott.bmp
 share/eagle/ulp/mill-outlines-cnc.bmp
 share/eagle/ulp/mill-outlines-coppdim.bmp
@@ -686,6 +698,7 @@ share/eagle/ulp/remove-dev-sym-pac.ulp
 share/eagle/ulp/renumber-sch.ulp
 share/eagle/ulp/run-loop-all-lbr-script.ulp
 share/eagle/ulp/run-loop-all-lbr-ulp.ulp
+share/eagle/ulp/set_name_value.ulp
 share/eagle/ulp/silk.ulp
 share/eagle/ulp/smash-all-sch.ulp
 share/eagle/ulp/smd-coordinate.ulp
diff --git a/cad/linux-eagle5/Makefile b/cad/linux-eagle5/Makefile
index 697f8bf1ac34..73e0b8718a17 100644
--- a/cad/linux-eagle5/Makefile
+++ b/cad/linux-eagle5/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	linux-eagle
-EAGLEVERSION?=	4.15
+EAGLEVERSION?=	4.16
 EAGLELANG?=	eng
 PORTVERSION=	${EAGLEVERSION:S/r/./}
 CATEGORIES?=	cad linux
@@ -17,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER?=	riggs@rrr.de
 COMMENT?=	An easy to use, yet powerful tool for designing printed circuit boards
 
-CONFLICTS?=	de-linux-eagle-*
+CONFLICTS?=	de-linux-eagle-[0-9]*
 
 ONLY_FOR_ARCHS=	i386
 
@@ -39,8 +39,9 @@ do-install:
 	@${MKDIR} ${DATADIR}
 	@ cd ${WRKSRC} && ${FIND} * -type f -print | ${CPIO} ${BINOWN}:${BINGRP} ${DATADIR}
 	@ cd ${DATADIR} && ${FIND} * -type d -print | ${XARGS} ${CHMOD} 0755
-	@${LN} -sf ${DATADIR}/bin/eagle ${PREFIX}/bin/eagle
 	@${INSTALL_MAN} ${DATADIR}/man/eagle.1 ${PREFIX}/man/man1
+	@${SED} -e "s:%%DATADIR%%:${DATADIR}:g" ${FILESDIR}/eagle.sh > ${PREFIX}/bin/eagle
+	@${CHMOD} 0555 ${PREFIX}/bin/eagle
 
 post-install:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${PKGDIR}/pkg-message > \
diff --git a/cad/linux-eagle5/distinfo b/cad/linux-eagle5/distinfo
index 959080fba18a..16b8117a9ef2 100644
--- a/cad/linux-eagle5/distinfo
+++ b/cad/linux-eagle5/distinfo
@@ -1,3 +1,3 @@
-MD5 (eagle-lin-eng-4.15.tgz) = b9a3ec50033785903cfccba86de0b367
-SHA256 (eagle-lin-eng-4.15.tgz) = 39e82b906798802aef2a31dc711ad1055c1ae9c57f85e181b4800c9d3c6b87fd
-SIZE (eagle-lin-eng-4.15.tgz) = 8165519
+MD5 (eagle-lin-eng-4.16.tgz) = 99843bdfa22503cad5ddc3b0dbbb0d2d
+SHA256 (eagle-lin-eng-4.16.tgz) = 6e546223b9981d5e753f52d0104459dc9a89bf0fd5c19a30c7b12be56ad55225
+SIZE (eagle-lin-eng-4.16.tgz) = 8367197
diff --git a/cad/linux-eagle5/files/eagle.sh b/cad/linux-eagle5/files/eagle.sh
new file mode 100644
index 000000000000..893690f14bdb
--- /dev/null
+++ b/cad/linux-eagle5/files/eagle.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+EAGLEBIN=%%DATADIR%%/bin/eagle
+
+$EAGLEBIN "$@"
diff --git a/cad/linux-eagle5/pkg-plist b/cad/linux-eagle5/pkg-plist
index a1d0ffa0957e..ca257aa24768 100644
--- a/cad/linux-eagle5/pkg-plist
+++ b/cad/linux-eagle5/pkg-plist
@@ -384,18 +384,21 @@ share/eagle/lbr/con-conrad.lbr
 share/eagle/lbr/con-deutsch.lbr
 share/eagle/lbr/con-dil.lbr
 share/eagle/lbr/con-erni.lbr
+share/eagle/lbr/con-faston.lbr
 share/eagle/lbr/con-friwo.lbr
 share/eagle/lbr/con-harting-h.lbr
 share/eagle/lbr/con-harting-ml.lbr
 share/eagle/lbr/con-harting-v.lbr
 share/eagle/lbr/con-harting.lbr
 share/eagle/lbr/con-hirschmann.lbr
+share/eagle/lbr/con-jack.lbr
 share/eagle/lbr/con-jst.lbr
 share/eagle/lbr/con-lsta.lbr
 share/eagle/lbr/con-lstb.lbr
 share/eagle/lbr/con-lumberg.lbr
 share/eagle/lbr/con-molex.lbr
 share/eagle/lbr/con-neutrik_ag.lbr
+share/eagle/lbr/con-omron.lbr
 share/eagle/lbr/con-panduit.lbr
 share/eagle/lbr/con-pc.lbr
 share/eagle/lbr/con-pc104.lbr
@@ -458,6 +461,7 @@ share/eagle/lbr/micro-intel.lbr
 share/eagle/lbr/micro-mc68000.lbr
 share/eagle/lbr/micro-motorola.lbr
 share/eagle/lbr/micro-philips.lbr
+share/eagle/lbr/micro-samsung.lbr
 share/eagle/lbr/micro-siemens.lbr
 share/eagle/lbr/microchip.lbr
 share/eagle/lbr/micronas.lbr
@@ -644,11 +648,19 @@ share/eagle/ulp/import-bmp.ulp
 share/eagle/ulp/import-ultiboard-ddf.ulp
 share/eagle/ulp/length-freq-ri.ulp
 share/eagle/ulp/length.ulp
+share/eagle/ulp/make_bga_package.bmp
+share/eagle/ulp/make_package_dual.bmp
+share/eagle/ulp/make_package_meass_pacinfo.bmp
+share/eagle/ulp/make_package_meass_padinfo.bmp
+share/eagle/ulp/make_package_quad_left.bmp
+share/eagle/ulp/make_package_quad_middle.bmp
 share/eagle/ulp/make-symbol-device-package-bsdl.ulp
 share/eagle/ulp/make_symbol_dual1.bmp
 share/eagle/ulp/make_symbol_dual2.bmp
 share/eagle/ulp/make_symbol_quad.bmp
 share/eagle/ulp/make_symbol_single.bmp
+share/eagle/ulp/microstrip-radial-stub.bmp
+share/eagle/ulp/microstrip-radial-stub.ulp
 share/eagle/ulp/mill-outlines-bott.bmp
 share/eagle/ulp/mill-outlines-cnc.bmp
 share/eagle/ulp/mill-outlines-coppdim.bmp
@@ -686,6 +698,7 @@ share/eagle/ulp/remove-dev-sym-pac.ulp
 share/eagle/ulp/renumber-sch.ulp
 share/eagle/ulp/run-loop-all-lbr-script.ulp
 share/eagle/ulp/run-loop-all-lbr-ulp.ulp
+share/eagle/ulp/set_name_value.ulp
 share/eagle/ulp/silk.ulp
 share/eagle/ulp/smash-all-sch.ulp
 share/eagle/ulp/smd-coordinate.ulp
diff --git a/german/linux-eagle/Makefile b/german/linux-eagle/Makefile
index 7f20015d5b69..7ae52f17750e 100644
--- a/german/linux-eagle/Makefile
+++ b/german/linux-eagle/Makefile
@@ -12,9 +12,10 @@ CATEGORIES?=	german cad linux
 MAINTAINER=	riggs@rrr.de
 COMMENT=	An easy to use, yet powerful tool for designing printed circuit boards
 
-CONFLICTS=	linux-eagle-*
+CONFLICTS=	linux-eagle-[0-9]*
 
 SLAVE_PORT=	yes
 MASTER_PORT=	cad/linux-eagle
+FILESDIR=	${.CURDIR}/../../${MASTER_PORT}/files
 
 .include "../../cad/linux-eagle/Makefile"
diff --git a/german/linux-eagle/distinfo b/german/linux-eagle/distinfo
index e3605eecace4..b1fc68770ef5 100644
--- a/german/linux-eagle/distinfo
+++ b/german/linux-eagle/distinfo
@@ -1,3 +1,3 @@
-MD5 (eagle-lin-ger-4.15.tgz) = 438f09c9db86ac950151f3eaa7eb430a
-SHA256 (eagle-lin-ger-4.15.tgz) = 9ff98c0b5e279e58c3a9d72469fb7899c0f65a0dd5cffdf12aaf2de3041f293b
-SIZE (eagle-lin-ger-4.15.tgz) = 8265345
+MD5 (eagle-lin-ger-4.16.tgz) = 2b6fea096e78d07f6f0e43b7014ce4a4
+SHA256 (eagle-lin-ger-4.16.tgz) = 4b375ead8305770484e6c43013dad94d77a5bb5e8717b860d4cc7c1544d5b894
+SIZE (eagle-lin-ger-4.16.tgz) = 8465354
diff --git a/german/linux-eagle/pkg-plist b/german/linux-eagle/pkg-plist
index 6fe8be46ac13..b49e177626ad 100644
--- a/german/linux-eagle/pkg-plist
+++ b/german/linux-eagle/pkg-plist
@@ -268,9 +268,9 @@ share/eagle/help/321.htm
 share/eagle/help/322.htm
 share/eagle/help/323.htm
 share/eagle/help/324.htm
+share/eagle/help/325.htm
 share/eagle/help/326.htm
 share/eagle/help/327.htm
-share/eagle/help/325.htm
 share/eagle/help/33.htm
 share/eagle/help/34.htm
 share/eagle/help/35.htm
@@ -383,21 +383,24 @@ share/eagle/lbr/con-chipcard-iso7816.lbr
 share/eagle/lbr/con-coax.lbr
 share/eagle/lbr/con-commcon.lbr
 share/eagle/lbr/con-conrad.lbr
-share/eagle/lbr/con-dil.lbr
 share/eagle/lbr/con-deutsch.lbr
+share/eagle/lbr/con-dil.lbr
 share/eagle/lbr/con-erni.lbr
+share/eagle/lbr/con-faston.lbr
 share/eagle/lbr/con-friwo.lbr
 share/eagle/lbr/con-harting-h.lbr
 share/eagle/lbr/con-harting-ml.lbr
 share/eagle/lbr/con-harting-v.lbr
 share/eagle/lbr/con-harting.lbr
 share/eagle/lbr/con-hirschmann.lbr
+share/eagle/lbr/con-jack.lbr
 share/eagle/lbr/con-jst.lbr
 share/eagle/lbr/con-lsta.lbr
 share/eagle/lbr/con-lstb.lbr
 share/eagle/lbr/con-lumberg.lbr
 share/eagle/lbr/con-molex.lbr
 share/eagle/lbr/con-neutrik_ag.lbr
+share/eagle/lbr/con-omron.lbr
 share/eagle/lbr/con-panduit.lbr
 share/eagle/lbr/con-pc.lbr
 share/eagle/lbr/con-pc104.lbr
@@ -423,8 +426,8 @@ share/eagle/lbr/diode.lbr
 share/eagle/lbr/display-hp.lbr
 share/eagle/lbr/display-lcd.lbr
 share/eagle/lbr/ecl.lbr
-share/eagle/lbr/exar.lbr
 share/eagle/lbr/etx-board.lbr
+share/eagle/lbr/exar.lbr
 share/eagle/lbr/fiber-optic-hp.lbr
 share/eagle/lbr/fiber-optic-siemens.lbr
 share/eagle/lbr/fifo.lbr
@@ -437,8 +440,8 @@ share/eagle/lbr/ic-package.lbr
 share/eagle/lbr/inductor-coilcraft.lbr
 share/eagle/lbr/inductor-neosid.lbr
 share/eagle/lbr/inductors.lbr
-share/eagle/lbr/infineon.lbr
 share/eagle/lbr/infineon-tricore.lbr
+share/eagle/lbr/infineon.lbr
 share/eagle/lbr/isd.lbr
 share/eagle/lbr/jumper.lbr
 share/eagle/lbr/lattice.lbr
@@ -460,6 +463,7 @@ share/eagle/lbr/micro-intel.lbr
 share/eagle/lbr/micro-mc68000.lbr
 share/eagle/lbr/micro-motorola.lbr
 share/eagle/lbr/micro-philips.lbr
+share/eagle/lbr/micro-samsung.lbr
 share/eagle/lbr/micro-siemens.lbr
 share/eagle/lbr/microchip.lbr
 share/eagle/lbr/micronas.lbr
@@ -517,8 +521,8 @@ share/eagle/lbr/testpad.lbr
 share/eagle/lbr/texas.lbr
 share/eagle/lbr/toshiba.lbr
 share/eagle/lbr/trafo-siemens.lbr
-share/eagle/lbr/trafo.lbr
 share/eagle/lbr/trafo-xicon.lbr
+share/eagle/lbr/trafo.lbr
 share/eagle/lbr/transistor-fet.lbr
 share/eagle/lbr/transistor-npn.lbr
 share/eagle/lbr/transistor-pnp.lbr
@@ -575,11 +579,11 @@ share/eagle/ulp/cam2print-box-grey-optimize.bmp
 share/eagle/ulp/cam2print-box-grey-poscoord.bmp
 share/eagle/ulp/cam2print-box-grey-quickplot.bmp
 share/eagle/ulp/cam2print.ulp
-share/eagle/ulp/cmd-change-brd-width.ulp
 share/eagle/ulp/change-pad-in-lbr-1.bmp
 share/eagle/ulp/change-pad-in-lbr-x.bmp
 share/eagle/ulp/change-pad-in-lbr.ulp
 share/eagle/ulp/clear-layer-in-lbr.ulp
+share/eagle/ulp/cmd-change-brd-width.ulp
 share/eagle/ulp/cmd-change-class.ulp
 share/eagle/ulp/cmd-change-swap-layer.ulp
 share/eagle/ulp/cmd-net-list2sch.ulp
@@ -644,13 +648,21 @@ share/eagle/ulp/import-bmp-ratio.bmp
 share/eagle/ulp/import-bmp-scale.bmp
 share/eagle/ulp/import-bmp.ulp
 share/eagle/ulp/import-ultiboard-ddf.ulp
-share/eagle/ulp/length.ulp
 share/eagle/ulp/length-freq-ri.ulp
+share/eagle/ulp/length.ulp
+share/eagle/ulp/make_bga_package.bmp
+share/eagle/ulp/make_package_dual.bmp
+share/eagle/ulp/make_package_meass_pacinfo.bmp
+share/eagle/ulp/make_package_meass_padinfo.bmp
+share/eagle/ulp/make_package_quad_left.bmp
+share/eagle/ulp/make_package_quad_middle.bmp
 share/eagle/ulp/make-symbol-device-package-bsdl.ulp
 share/eagle/ulp/make_symbol_dual1.bmp
 share/eagle/ulp/make_symbol_dual2.bmp
 share/eagle/ulp/make_symbol_quad.bmp
 share/eagle/ulp/make_symbol_single.bmp
+share/eagle/ulp/microstrip-radial-stub.bmp
+share/eagle/ulp/microstrip-radial-stub.ulp
 share/eagle/ulp/mill-outlines-bott.bmp
 share/eagle/ulp/mill-outlines-cnc.bmp
 share/eagle/ulp/mill-outlines-coppdim.bmp
@@ -688,6 +700,7 @@ share/eagle/ulp/remove-dev-sym-pac.ulp
 share/eagle/ulp/renumber-sch.ulp
 share/eagle/ulp/run-loop-all-lbr-script.ulp
 share/eagle/ulp/run-loop-all-lbr-ulp.ulp
+share/eagle/ulp/set_name_value.ulp
 share/eagle/ulp/silk.ulp
 share/eagle/ulp/smash-all-sch.ulp
 share/eagle/ulp/smd-coordinate.ulp
@@ -698,8 +711,8 @@ share/eagle/ulp/statistic-brd.ulp
 share/eagle/ulp/statistic-lbr.ulp
 share/eagle/ulp/statistic_attention_min_value.bmp
 share/eagle/ulp/ulpmessage.ulp
-share/eagle/ulp/unidat.ulp
 share/eagle/ulp/unidat-fiducials.ulp
+share/eagle/ulp/unidat.ulp
 share/eagle/ulp/update-packages.ulp
 share/eagle/ulp/useful-routines.ulp
 share/eagle/ulp/warning.bmp