summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cad/pcb/DESCR7
-rw-r--r--cad/pcb/Makefile21
-rw-r--r--cad/pcb/PLIST92
-rw-r--r--cad/pcb/distinfo13
-rw-r--r--cad/pcb/patches/patch-icon-theme-installer12
-rw-r--r--cad/pcb/patches/patch-src_gettext.h13
-rw-r--r--cad/pcb/patches/patch-src_report.c12
7 files changed, 115 insertions, 55 deletions
diff --git a/cad/pcb/DESCR b/cad/pcb/DESCR
index a6ac77f61fd..c8bf828ac50 100644
--- a/cad/pcb/DESCR
+++ b/cad/pcb/DESCR
@@ -1,3 +1,8 @@
pcb is a printed circuit board layout tool. It includes connectivity driven
layout (rat lines), a layout versus netlist check, design rule checker as well
-as industry standard RS274-X (Gerber) photoplot export.
+as industry standard RS274-X (Gerber) photoplot export. Other features include
+ - PNG/JPEG/EPS output for documentation
+ - Bill of materials output
+ - X-Y pick and place output
+ - Two different autorouters
+ - Growing footprint library
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index c6218731342..ad4b934949c 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2016/08/03 10:22:33 adam Exp $
+# $NetBSD: Makefile,v 1.84 2017/01/21 01:56:13 dmcmahill Exp $
#
-DISTNAME= pcb-20140316
-PKGREVISION= 1
+DISTNAME= pcb-4.0.0
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pcb/}
@@ -35,10 +34,10 @@ LDFLAGS+= -lstdc++ -lm # direct link as required by ld v2.22
USE_LANGUAGES= c c++
PKG_OPTIONS_VAR= PKG_OPTIONS.pcb
-PKG_SUPPORTED_OPTIONS= png
+PKG_SUPPORTED_OPTIONS= png gl
PKG_OPTIONS_REQUIRED_GROUPS= gui
PKG_OPTIONS_GROUP.gui= batch gtk motif
-PKG_SUGGESTED_OPTIONS= gtk png
+PKG_SUGGESTED_OPTIONS= gtk png gl
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.options.mk"
@@ -51,6 +50,12 @@ CONFIGURE_ARGS+= --with-gui=lesstif
.include "../../graphics/glu/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
CONFIGURE_ARGS+= --with-gui=gtk
+# users who use the GTK gui on an X server which does
+# not support GL (tightvnc for exmple) will need
+# to disable GL
+. if empty(PKG_OPTIONS:Mgl)
+CONFIGURE_ARGS+= --disable-gl
+. endif
.elif !empty(PKG_OPTIONS:Mbatch)
CONFIGURE_ARGS+= --with-gui=none
.else
@@ -62,14 +67,16 @@ PKG_FAIL_REASON+= Invalid options
.include "../../sysutils/dbus/buildlink3.mk"
.endif
-EXPORTERS= bom gcode gerber ps
+EXPORTERS= bom gcode gerber ipcd356 ps
.if !empty(PKG_OPTIONS:Mpng)
-EXPORTERS+= png
+# these three need gd
+EXPORTERS+= gcode nelma png
.include "../../graphics/gd/buildlink3.mk"
.endif
CONFIGURE_ARGS+= --with-exporters=${EXPORTERS:Q}
+
post-extract:
${CHMOD} -R go-w ${WRKSRC}
diff --git a/cad/pcb/PLIST b/cad/pcb/PLIST
index 70f079f5cc5..c7b4c7f5ff7 100644
--- a/cad/pcb/PLIST
+++ b/cad/pcb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2016/01/22 21:56:36 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/01/21 01:56:13 dmcmahill Exp $
bin/MergePCBPS
bin/Merge_dimPCBPS
bin/pcb
@@ -6,6 +6,8 @@ info/pcb.info
man/man1/pcb.1
share/appdata/pcb.appdata.xml
share/applications/pcb.desktop
+share/doc/pcb/debumpify.out.png
+share/doc/pcb/debumpify.png
share/doc/pcb/examples/LED.net
share/doc/pcb/examples/LED.pcb
share/doc/pcb/examples/LED2.pcb
@@ -15,13 +17,24 @@ share/doc/pcb/examples/libraries/example.m4
share/doc/pcb/gcode.png
share/doc/pcb/gcode_control_img.png
share/doc/pcb/gcode_tool_path.png
+share/doc/pcb/miter.out.png
+share/doc/pcb/miter.png
+share/doc/pcb/orthopull.out.png
+share/doc/pcb/orthopull.png
share/doc/pcb/pad.png
share/doc/pcb/pcb.html
share/doc/pcb/pcb.pdf
share/doc/pcb/puller.png
share/doc/pcb/refcard.pdf
+share/doc/pcb/td_ex1.png
share/doc/pcb/thermal.png
share/doc/pcb/tutorial/tut1.pcb
+share/doc/pcb/unjaggy.out.png
+share/doc/pcb/unjaggy.png
+share/doc/pcb/vianudge.out.png
+share/doc/pcb/vianudge.png
+share/doc/pcb/viatrim.out.png
+share/doc/pcb/viatrim.png
share/gEDA/scheme/gnet-pcbfwd.scm
share/icons/hicolor/16x16/mimetypes/application-x-excellon-16.png
share/icons/hicolor/16x16/mimetypes/application-x-gerber-16.png
@@ -55,6 +68,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-gerber.svg
share/icons/hicolor/scalable/mimetypes/application-x-pcb-footprint.svg
share/icons/hicolor/scalable/mimetypes/application-x-pcb-layout.svg
share/icons/hicolor/scalable/mimetypes/application-x-pcb-netlist.svg
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/pcb.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/pcb.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/pcb.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/pcb.mo
@@ -78,6 +92,9 @@ share/pcb/m4/amp.m4
share/pcb/m4/amphenol.inc
share/pcb/m4/amphenol.list
share/pcb/m4/amphenol.m4
+share/pcb/m4/aries.inc
+share/pcb/m4/aries.list
+share/pcb/m4/aries.m4
share/pcb/m4/bga.inc
share/pcb/m4/bourns.inc
share/pcb/m4/bourns.list
@@ -208,6 +225,71 @@ share/pcb/pcblib-newlib/amphenol/AMPHENOL_ARFX1230.fp
share/pcb/pcblib-newlib/amphenol/AMPHENOL_ARFX1231.fp
share/pcb/pcblib-newlib/amphenol/AMPHENOL_ARFX1232.fp
share/pcb/pcblib-newlib/amphenol/index.html
+share/pcb/pcblib-newlib/aries/ARIES_24_3551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_24_3552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_24_3553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_24_3554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_24_6551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_24_6552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_24_6553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_24_6554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_28_3551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_28_3552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_28_3553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_28_3554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_28_6551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_28_6552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_28_6553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_28_6554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_32_3551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_32_3552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_32_3553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_32_3554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_32_6551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_32_6552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_32_6553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_32_6554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_36_3551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_36_3552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_36_3553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_36_3554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_36_6551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_36_6552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_36_6553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_36_6554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_40_3551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_40_3552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_40_3553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_40_3554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_40_6551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_40_6552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_40_6553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_40_6554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_42_3551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_42_3552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_42_3553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_42_3554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_42_6551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_42_6552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_42_6553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_42_6554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_44_3551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_44_3552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_44_3553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_44_3554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_44_6551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_44_6552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_44_6553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_44_6554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_48_3551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_48_3552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_48_3553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_48_3554_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_48_6551_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_48_6552_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_48_6553_1.fp
+share/pcb/pcblib-newlib/aries/ARIES_48_6554_1.fp
+share/pcb/pcblib-newlib/aries/index.html
share/pcb/pcblib-newlib/bourns/BOURNS_3224G.fp
share/pcb/pcblib-newlib/bourns/BOURNS_3224J.fp
share/pcb/pcblib-newlib/bourns/BOURNS_3224W.fp
@@ -606,6 +688,7 @@ share/pcb/pcblib-newlib/geda/LQFP64_10.fp
share/pcb/pcblib-newlib/geda/LQFP64_14.fp
share/pcb/pcblib-newlib/geda/LQFP64_7.fp
share/pcb/pcblib-newlib/geda/LQFP72_10.fp
+share/pcb/pcblib-newlib/geda/LQFP80_10.fp
share/pcb/pcblib-newlib/geda/LQFP80_12.fp
share/pcb/pcblib-newlib/geda/LQFP80_14.fp
share/pcb/pcblib-newlib/geda/MPAK.fp
@@ -658,6 +741,7 @@ share/pcb/pcblib-newlib/geda/QFN20_5.fp
share/pcb/pcblib-newlib/geda/QFN20_5_EP.fp
share/pcb/pcblib-newlib/geda/QFN24_4.fp
share/pcb/pcblib-newlib/geda/QFN24_4_EP.fp
+share/pcb/pcblib-newlib/geda/QFN24_5.fp
share/pcb/pcblib-newlib/geda/QFN28_5.fp
share/pcb/pcblib-newlib/geda/QFN28_5_EP.fp
share/pcb/pcblib-newlib/geda/QFN32_5.fp
@@ -758,6 +842,7 @@ share/pcb/pcblib-newlib/geda/SC70_3.fp
share/pcb/pcblib-newlib/geda/SC70_4.fp
share/pcb/pcblib-newlib/geda/SC70_5.fp
share/pcb/pcblib-newlib/geda/SC70_6.fp
+share/pcb/pcblib-newlib/geda/SC88A.fp
share/pcb/pcblib-newlib/geda/SC90.fp
share/pcb/pcblib-newlib/geda/SDIP18.fp
share/pcb/pcblib-newlib/geda/SDIP20.fp
@@ -810,6 +895,7 @@ share/pcb/pcblib-newlib/geda/SOD106A.fp
share/pcb/pcblib-newlib/geda/SOD110.fp
share/pcb/pcblib-newlib/geda/SOD123.fp
share/pcb/pcblib-newlib/geda/SOD323.fp
+share/pcb/pcblib-newlib/geda/SOD523.fp
share/pcb/pcblib-newlib/geda/SOD80.fp
share/pcb/pcblib-newlib/geda/SOD87.fp
share/pcb/pcblib-newlib/geda/SOJ14_300.fp
@@ -884,8 +970,8 @@ share/pcb/pcblib-newlib/geda/SOT25.fp
share/pcb/pcblib-newlib/geda/SOT26.fp
share/pcb/pcblib-newlib/geda/SOT323.fp
share/pcb/pcblib-newlib/geda/SOT323D.fp
-share/pcb/pcblib-newlib/geda/SOT325.fp
share/pcb/pcblib-newlib/geda/SOT326.fp
+share/pcb/pcblib-newlib/geda/SOT353.fp
share/pcb/pcblib-newlib/geda/SOT89.fp
share/pcb/pcblib-newlib/geda/SSOP14.fp
share/pcb/pcblib-newlib/geda/SSOP16.fp
@@ -932,6 +1018,7 @@ share/pcb/pcblib-newlib/geda/TQFN20_5.fp
share/pcb/pcblib-newlib/geda/TQFN20_5_EP.fp
share/pcb/pcblib-newlib/geda/TQFN24_4.fp
share/pcb/pcblib-newlib/geda/TQFN24_4_EP.fp
+share/pcb/pcblib-newlib/geda/TQFN24_5.fp
share/pcb/pcblib-newlib/geda/TQFN28_5.fp
share/pcb/pcblib-newlib/geda/TQFN28_5_EP.fp
share/pcb/pcblib-newlib/geda/TQFN32_5.fp
@@ -1177,3 +1264,4 @@ share/pcb/tools/apctools.zip
share/pcb/tools/gerbertotk.c
share/pcb/tools/pcb2ncap.tgz
share/pcb/tools/pcbdiff
+@pkgdir share/pcb/newlib/sockets
diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo
index 54efac87690..7ab8bd946ce 100644
--- a/cad/pcb/distinfo
+++ b/cad/pcb/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.24 2016/04/03 12:48:38 joerg Exp $
+$NetBSD: distinfo,v 1.25 2017/01/21 01:56:13 dmcmahill Exp $
-SHA1 (pcb-20140316.tar.gz) = ec714ff136d1817e500e1a9e654e786883b9501e
-RMD160 (pcb-20140316.tar.gz) = 70ef878227ad52c83ce4499373550e7a8d807dd4
-SHA512 (pcb-20140316.tar.gz) = 5b9a2704b4d3c95f03afad0fe8fb5414b2aa9d680e40bf77ad9b46a9d4e14ba740858092794a9ff6788f31ac19063b126d8ceed6316c0d9eaaaa574e6678c071
-Size (pcb-20140316.tar.gz) = 4210077 bytes
-SHA1 (patch-icon-theme-installer) = b3b183f2ab77c56e52d4cd96058a28bc7e2832bb
-SHA1 (patch-src_gettext.h) = 2f256e29caa89e58931279a40eecc9e8a3b93d04
-SHA1 (patch-src_report.c) = 4ed8fa6eeb8401c0fe052c7beecd44b307ec0d73
+SHA1 (pcb-4.0.0.tar.gz) = f401802b95a7f70c54a56ad98c4aa3961ba55cba
+RMD160 (pcb-4.0.0.tar.gz) = 27302f64fb9f8e980285235b10b9d7ab9170f68f
+SHA512 (pcb-4.0.0.tar.gz) = b77077d7ae93fbbd3cd2f57e85921336257af73bb90776139968c40523ff2b136a56e844a9eae161a0b14b92dc58d390274ef0b4a99e1d8007c12b117f087ada
+Size (pcb-4.0.0.tar.gz) = 4676879 bytes
diff --git a/cad/pcb/patches/patch-icon-theme-installer b/cad/pcb/patches/patch-icon-theme-installer
deleted file mode 100644
index 1087b25fd5d..00000000000
--- a/cad/pcb/patches/patch-icon-theme-installer
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-icon-theme-installer,v 1.1 2012/02/16 11:43:25 hans Exp $
-
---- icon-theme-installer.orig 2009-12-25 18:18:18.329539169 +0100
-+++ icon-theme-installer 2009-12-25 19:01:51.837047302 +0100
-@@ -121,7 +121,6 @@ for icon in $@; do
- size=`echo $icon | sed -n 's/.*-\([0-9]*\).*/\1/p'`
- category=`echo $icon | cut -d, -f1`
- build_name=`echo $icon | cut -d, -f2`
-- install_name=`echo $build_name | sed 's/-[0-9]\+//g'`
- install_name=`basename $install_name`
-
- if test -z $size; then
diff --git a/cad/pcb/patches/patch-src_gettext.h b/cad/pcb/patches/patch-src_gettext.h
deleted file mode 100644
index 90f7b5b2f1f..00000000000
--- a/cad/pcb/patches/patch-src_gettext.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_gettext.h,v 1.1 2016/04/03 12:48:38 joerg Exp $
-
---- src/gettext.h.orig 2016-04-02 21:13:28.754215955 +0000
-+++ src/gettext.h
-@@ -93,6 +93,8 @@
-
- #endif
-
-+#include <locale.h>
-+
- /* A pseudo function call that serves as a marker for the automated
- extraction of messages, but does not call gettext(). The run-time
- translation is done at a different place in the code.
diff --git a/cad/pcb/patches/patch-src_report.c b/cad/pcb/patches/patch-src_report.c
deleted file mode 100644
index 1b302679902..00000000000
--- a/cad/pcb/patches/patch-src_report.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_report.c,v 1.2 2016/03/07 23:40:47 dsainty Exp $
-
---- src/report.c.orig 2014-03-10 23:09:51.000000000 -0400
-+++ src/report.c 2016-01-22 10:05:47.000000000 -0500
-@@ -32,4 +32,7 @@
- #endif
-
-+#ifdef HAVE_LOCALE_H
-+#include <locale.h> /* setlocale() and LC_ALL */
-+#endif
- #include <math.h>
-