diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2014-05-26 20:21:53 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2014-05-26 20:21:53 +0000 |
commit | 8f1ba19b377ac6c2d674bc74bc55c6e1307018c1 (patch) | |
tree | 7bae51f3730a7d46a79a4eeb9e751295b3e0a5a1 /cad | |
parent | 869c04242a5d6d9ef9c8b90c3d3f032e6331572b (diff) | |
download | ports-8f1ba19b377ac6c2d674bc74bc55c6e1307018c1.tar.gz ports-8f1ba19b377ac6c2d674bc74bc55c6e1307018c1.zip |
Update to 20140316.
Notes
Notes:
svn path=/head/; revision=355444
Diffstat (limited to 'cad')
-rw-r--r-- | cad/pcb/Makefile | 69 | ||||
-rw-r--r-- | cad/pcb/distinfo | 4 | ||||
-rw-r--r-- | cad/pcb/files/patch-doc-Makefile.in | 12 | ||||
-rw-r--r-- | cad/pcb/pkg-plist | 8 |
4 files changed, 40 insertions, 53 deletions
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index 7017daf98093..61018ef3df4d 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pcb -PORTVERSION= 20110918 -PORTREVISION= 3 +PORTVERSION= 20140316 CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -21,25 +20,44 @@ BUILD_DEPENDS:= ${RUN_DEPENDS} CONFLICTS= gts-[0-9]* USE_AUTOTOOLS= autoconf -USES= gmake pkgconfig tk:run +USES= gmake pkgconfig tk:run shared-mime-info desktop-file-utils INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= INSTALL_DATA="${BSD_INSTALL_DATA}" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -pthread -L${LOCALBASE}/lib -CONFIGURE_ARGS= --docdir=${DOCSDIR} +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -PORTDOCS= pcb.html pcb.pdf refcard.pdf pad.png puller.png thermal.png \ - examples tutorial gcode.png gcode_control_img.png \ - gcode_tool_path.png +PORTDOCS= \ + pcb.html pcb.pdf refcard.pdf pad.png puller.png thermal.png \ + examples tutorial gcode.png gcode_control_img.png \ + gcode_tool_path.png -OPTIONS_DEFINE= DOCS NLS X11 +OPTIONS_DEFINE= DOCS NLS OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI=MOTIF GTK NONE -OPTIONS_DEFAULT=DOCS X11 GTK +OPTIONS_DEFAULT=DOCS GTK +DOCS_CONFIGURE_ENABLE= doc +DOCS_CONFIGURE_ON= --docdir=${DOCSDIR} +NLS_CONFIGURE_ENABLE= nls +NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE} \ + ${ICONV_CONFIGURE_ARG} +NLS_CONFIGURE_OFF= --without-libintl \ + --without-iconv +NLS_USES= gettext iconv +.for L in fr nl ru pt_BR +NLS_PLIST_FILES+= share/locale/${L}/LC_MESSAGES/pcb.mo +.endfor MOTIF_DESC= Motif widgets +MOTIF_USES= motif +MOTIF_CONFIGURE_ON= --with-gui=lesstif +MOTIF_CONFIGURE_ENV= WISH=${WISH} GTK_DESC= GIMP ToolKit widgets +GTK_USE= GNOME=gtk20 +GTK_CONFIGURE_ON= --with-gui=gtk +GTK_CONFIGURE_ENV= WISH=${WISH} NONE_DESC= No GUI support +NONE_CONFIGURE_ON= --without-gui +NONE_CONFIGURE_ENV= WISH=/usr/bin/true .for a in ia64 powerpc sparc64 BROKEN_${a}= Does not compile on ia64, powerpc, or sparc64 @@ -47,39 +65,8 @@ BROKEN_${a}= Does not compile on ia64, powerpc, or sparc64 .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+=--enable-nls \ - ${ICONV_CONFIGURE_ARG} \ - --with-libintl-prefix=${LOCALBASE} -USES+= gettext iconv -.for L in fr nl ru -PLIST_FILES+= share/locale/${L}/LC_MESSAGES/pcb.mo -.endfor -.else -CONFIGURE_ARGS+=--disable-nls \ - --without-libiconv \ - --without-libintl -.endif - -.if ${PORT_OPTIONS:MX11} -.if ${PORT_OPTIONS:MNONE} -CONFIGURE_ARGS+= --without-gui -CONFIGURE_ENV+= WISH=${TRUE} -.elif ${PORT_OPTIONS:MMOTIF} -USES+= motif -CONFIGURE_ARGS+= --with-gui=lesstif -CONFIGURE_ENV+= WISH=${WISH} -.elif ${PORT_OPTIONS:MGTK} -USE_GNOME= gtk20 desktopfileutils -CONFIGURE_ARGS+= --with-gui=gtk -CONFIGURE_ENV+= WISH=${WISH} -.endif -.endif - .if ${PORT_OPTIONS:MDOCS} INFO= pcb -.else -CONFIGURE_ARGS+= --disable-doc .endif .include <bsd.port.mk> diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo index ba477d4d9b75..20625158abd3 100644 --- a/cad/pcb/distinfo +++ b/cad/pcb/distinfo @@ -1,2 +1,2 @@ -SHA256 (pcb-20110918.tar.gz) = 6da47c4f98491c8a9ed010503d4ec1d03473bfc5bb00ea9b7176cb3848a09f1b -SIZE (pcb-20110918.tar.gz) = 4015128 +SHA256 (pcb-20140316.tar.gz) = 82c4f39438ee4e278196a3b67ef021145dcfbb00519508ccf51aa7832121c950 +SIZE (pcb-20140316.tar.gz) = 4210077 diff --git a/cad/pcb/files/patch-doc-Makefile.in b/cad/pcb/files/patch-doc-Makefile.in index ebe7072a6909..a864c6e2a8a4 100644 --- a/cad/pcb/files/patch-doc-Makefile.in +++ b/cad/pcb/files/patch-doc-Makefile.in @@ -1,9 +1,9 @@ ---- doc/Makefile.in.orig 2010-09-30 05:52:39.000000000 +0900 -+++ doc/Makefile.in 2010-10-01 03:54:10.000000000 +0900 -@@ -16,7 +16,7 @@ - @SET_MAKE@ - - VPATH = @srcdir@ +--- doc/Makefile.in.orig 2014-03-17 12:14:42.000000000 +0900 ++++ doc/Makefile.in 2014-05-27 05:09:56.000000000 +0900 +@@ -33,7 +33,7 @@ + esac; \ + test $$am__dry = yes; \ + } -pkgdatadir = $(datadir)/@PACKAGE@ +pkgdatadir = $(docdir) pkgincludedir = $(includedir)/@PACKAGE@ diff --git a/cad/pcb/pkg-plist b/cad/pcb/pkg-plist index 64b356addf38..f24fc2aec576 100644 --- a/cad/pcb/pkg-plist +++ b/cad/pcb/pkg-plist @@ -1,10 +1,10 @@ bin/MergePCBPS bin/Merge_dimPCBPS bin/pcb -include/gts.h -lib/libgts.a %%PORTDOCS%%man/man1/pcb.1.gz share/applications/pcb.desktop +share/appdata/pcb.appdata.xml +@dirrmtry share/appdata share/icons/hicolor/16x16/mimetypes/application-x-excellon-16.png share/icons/hicolor/16x16/mimetypes/application-x-gerber-16.png share/icons/hicolor/16x16/mimetypes/application-x-pcb-footprint-16.png @@ -44,7 +44,6 @@ share/mime/application/x-pcb-layout.xml share/mime/application/x-pcb-netlist.xml @dirrmtry share/mime/application share/mime/packages/pcb.xml -@dirrmtry share/mime/packages share/mimelnk/application/x-excellon.desktop share/mimelnk/application/x-gerber.desktop share/mimelnk/application/x-pcb-footprint.desktop @@ -300,6 +299,7 @@ share/gEDA/scheme/gnet-pcbfwd.scm %%DATADIR%%/pcblib-newlib/geda/DIP28N.fp %%DATADIR%%/pcblib-newlib/geda/DIP32.fp %%DATADIR%%/pcblib-newlib/geda/DIP36.fp +%%DATADIR%%/pcblib-newlib/geda/DIP4.fp %%DATADIR%%/pcblib-newlib/geda/DIP40.fp %%DATADIR%%/pcblib-newlib/geda/DIP42.fp %%DATADIR%%/pcblib-newlib/geda/DIP44.fp @@ -1163,6 +1163,7 @@ share/gEDA/scheme/gnet-pcbfwd.scm %%DATADIR%%/tools/apctools.zip %%DATADIR%%/tools/gerbertotk.c %%DATADIR%%/tools/pcb2ncap.tgz +%%DATADIR%%/tools/pcbdiff %%DATADIR%%/tools/tgo2pcb.tcl %%DATADIR%%/tools/MergePCBPS %%DATADIR%%/tools/Merge_dimPCBPS @@ -1187,7 +1188,6 @@ share/gEDA/scheme/gnet-pcbfwd.scm @dirrm %%DATADIR%%/pcblib-newlib/amp @dirrm %%DATADIR%%/pcblib-newlib @dirrm %%DATADIR%%/newlib/tests -@dirrm %%DATADIR%%/newlib/sockets @dirrm %%DATADIR%%/newlib/not_vetted_ingo @dirrm %%DATADIR%%/newlib/msp430 @dirrm %%DATADIR%%/newlib/keystone |