Date: Sat, 8 Jul 2006 23:31:55 +0400 (MSD) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/99942: [UPDATE] cad/pcb update to 20060414 Message-ID: <200607081931.k68JVtv8028069@fonon.realnet> Resent-Message-ID: <200607082040.k68KeJa9003846@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99942
>Category: ports
>Synopsis: [UPDATE] cad/pcb update to 20060414
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 08 20:40:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stanislav Sedov
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006 root@fonon.realnet:/work/src/fbsd-cur/src/sys/i386/compile/FONON i386
>Description:
Update GEDA pcb package to recent version.
Additionally, Motif gui support has been added.
Note: I've removed all patchfiles and added new one.
>How-To-Repeat:
>Fix:
--- pcb.diff begins here ---
diff -ruN pcb.orig/Makefile pcb/Makefile
--- pcb.orig/Makefile Sat Jul 8 22:44:13 2006
+++ pcb/Makefile Sat Jul 8 23:25:48 2006
@@ -6,8 +6,7 @@
#
PORTNAME= pcb
-PORTVERSION= 20050609
-PORTREVISION= 1
+PORTVERSION= 20060414
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,18 +14,26 @@
MAINTAINER= hrs@FreeBSD.org
COMMENT= X11 interactive printed circuit board layout system
+LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS= ${BUILD_DEPENDS}
+.if defined(WITH_MOTIF_GUI)
+USE_MOTIF= yes
+CONFIGURE_ARGS+= --with-gui=lesstif
+.else
USE_GNOME= gtk20
+.endif
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-rpath
-
-INFO= pcb
+USE_GMAKE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I/usr/X11R6/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L/usr/X11R6/lib"
.if !defined(NOPORTDOCS)
-pre-install:
- ${INSTALL_DATA} ${WRKSRC}/doc/pcb.info ${PREFIX}/info
+INFO= pcb
+MAN1= pcb.1
+.else
+CONFIGURE_ARGS= --disable-doc
.endif
.include <bsd.port.mk>
diff -ruN pcb.orig/distinfo pcb/distinfo
--- pcb.orig/distinfo Sat Jul 8 22:44:13 2006
+++ pcb/distinfo Sat Jul 8 22:49:48 2006
@@ -1,3 +1,3 @@
-MD5 (pcb-20050609.tar.gz) = a09473705c80eaf4f796617263d9f8fe
-SHA256 (pcb-20050609.tar.gz) = 42e1d985b6737b5a6f4fda0c2233997126f5d673cf718bd9266bd39a0f3252ff
-SIZE (pcb-20050609.tar.gz) = 2371793
+MD5 (pcb-20060414.tar.gz) = 5e471a7b80f1b5ebf21be22c9b7a2e8e
+SHA256 (pcb-20060414.tar.gz) = 2077019a0b78514b57b9aeda778396b43dd8d9400c47ca8138b8bbf651b37819
+SIZE (pcb-20060414.tar.gz) = 3097668
diff -ruN pcb.orig/files/patch-Makefile.in pcb/files/patch-Makefile.in
--- pcb.orig/files/patch-Makefile.in Thu Jan 1 03:00:00 1970
+++ pcb/files/patch-Makefile.in Sat Jul 8 23:15:08 2006
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Sat Jul 8 23:14:41 2006
++++ Makefile.in Sat Jul 8 23:14:48 2006
+@@ -209,7 +209,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-DIRS = win32 src lib newlib example tools tutorial README_FILES
++DIRS = src lib newlib example tools tutorial README_FILES
+ SUBDIRS = ${DIRS} @DOC@
+ DIST_SUBDIRS = ${DIRS} doc
+ EXTRA_DIST = autogen.sh globalconst.h README.cvs README.win32
diff -ruN pcb.orig/files/patch-configure pcb/files/patch-configure
--- pcb.orig/files/patch-configure Sat Jul 8 22:44:13 2006
+++ pcb/files/patch-configure Thu Jan 1 03:00:00 1970
@@ -1,16 +0,0 @@
---- configure.orig Tue Jun 14 02:38:35 2005
-+++ configure Tue Jun 14 02:41:54 2005
-@@ -3612,13 +3612,6 @@
- done
- test -n "$WISH" || WISH="none"
-
--if test "X$WISH" = "Xnone" ; then
-- { { echo "$as_me:$LINENO: error: Did not find the wish executible. You need to make sure
-- that tcl is installed on your system and that wish is in your path" >&5
--echo "$as_me: error: Did not find the wish executible. You need to make sure
-- that tcl is installed on your system and that wish is in your path" >&2;}
-- { (exit 1); exit 1; }; }
--fi
-
-
- cat >>confdefs.h <<_ACEOF
diff -ruN pcb.orig/files/patch-nodoc pcb/files/patch-nodoc
--- pcb.orig/files/patch-nodoc Sat Jul 8 22:44:13 2006
+++ pcb/files/patch-nodoc Thu Jan 1 03:00:00 1970
@@ -1,22 +0,0 @@
---- Makefile.am.orig Sat Jun 11 14:45:54 2005
-+++ Makefile.am Sat Jun 11 14:46:08 2005
-@@ -2,7 +2,7 @@
- ##
- ## Top level automake file for PCB
-
--SUBDIRS= src lib newlib doc example tools tutorial README_FILES
-+SUBDIRS= src lib newlib example tools tutorial README_FILES
-
- EXTRA_DIST= autogen.sh globalconst.h README.cvs
-
---- Makefile.in.orig Sat Jun 11 14:46:00 2005
-+++ Makefile.in Sat Jun 11 14:46:06 2005
-@@ -169,7 +169,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = src lib newlib doc example tools tutorial README_FILES
-+SUBDIRS = src lib newlib example tools tutorial README_FILES
- EXTRA_DIST = autogen.sh globalconst.h README.cvs
- DISTCLEANFILES = configure.lineno
- all: config.h
diff -ruN pcb.orig/files/patch-src-gui-netlist-window.c pcb/files/patch-src-gui-netlist-window.c
--- pcb.orig/files/patch-src-gui-netlist-window.c Sat Jul 8 22:44:13 2006
+++ pcb/files/patch-src-gui-netlist-window.c Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/gui-netlist-window.c.orig Tue Mar 1 14:33:01 2005
-+++ src/gui-netlist-window.c Mon Jun 13 09:04:32 2005
-@@ -692,7 +692,7 @@
- {
- GtkTreePath *path;
- GtkTreeIter iter;
-- LibraryMenuType *net;;
-+ LibraryMenuType *net;
- gchar *name;
-
- if (!node_name)
diff -ruN pcb.orig/files/patch-src-vendor.c pcb/files/patch-src-vendor.c
--- pcb.orig/files/patch-src-vendor.c Sat Jul 8 22:44:13 2006
+++ pcb/files/patch-src-vendor.c Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/vendor.c.orig Mon Jun 13 09:05:39 2005
-+++ src/vendor.c Mon Jun 13 09:05:55 2005
-@@ -26,6 +26,8 @@
- #include "config.h"
- #endif
-
-+#include <sys/types.h>
-+
- #include <ctype.h>
- #include <math.h>
- #include <stdio.h>
diff -ruN pcb.orig/pkg-plist pcb/pkg-plist
--- pcb.orig/pkg-plist Sat Jul 8 22:44:13 2006
+++ pcb/pkg-plist Sat Jul 8 23:22:53 2006
@@ -1,4 +1,8 @@
@comment $FreeBSD: ports/cad/pcb/pkg-plist,v 1.16 2005/06/14 16:18:01 hrs Exp $
+bin/MergePCBPS
+bin/Merge_dimPCBPS
+bin/pcb
+bin/pcb-bin
%%DATADIR%%/CreateLibrary.sh
%%DATADIR%%/CreateLibraryContents.sh
%%DATADIR%%/ListLibraryContents.sh
@@ -38,9 +42,6 @@
%%DATADIR%%/m4/geda.m4
%%DATADIR%%/m4/generic.list
%%DATADIR%%/m4/generic.m4
-%%DATADIR%%/m4/genericsmt.inc
-%%DATADIR%%/m4/genericsmt.list
-%%DATADIR%%/m4/genericsmt.m4
%%DATADIR%%/m4/gtag.list
%%DATADIR%%/m4/gtag.m4
%%DATADIR%%/m4/jerry.list
@@ -144,11 +145,24 @@
%%DATADIR%%/newlib/tests/TO99fromLED
%%DATADIR%%/newlib/tests/UART
%%DATADIR%%/newlib/tests/monoblock_small
+%%PORTDOCS%%%%DATADIR%%/pad.eps
+%%PORTDOCS%%%%DATADIR%%/pad.gif
+%%PORTDOCS%%%%DATADIR%%/pad.pdf
+%%PORTDOCS%%%%DATADIR%%/pad.png
%%DATADIR%%/pcb-menu.res
+%%PORTDOCS%%%%DATADIR%%/pcb.html
+%%PORTDOCS%%%%DATADIR%%/pcb.pdf
+%%PORTDOCS%%%%DATADIR%%/pcb.ps
%%DATADIR%%/pcblib
%%DATADIR%%/pcblib.contents
%%DATADIR%%/qfp-ui
%%DATADIR%%/qfp.dat
+%%PORTDOCS%%%%DATADIR%%/refcard.pdf
+%%PORTDOCS%%%%DATADIR%%/refcard.ps
+%%PORTDOCS%%%%DATADIR%%/thermal.eps
+%%PORTDOCS%%%%DATADIR%%/thermal.gif
+%%PORTDOCS%%%%DATADIR%%/thermal.pdf
+%%PORTDOCS%%%%DATADIR%%/thermal.png
%%DATADIR%%/tools/MergePCBPS
%%DATADIR%%/tools/Merge_dimPCBPS
%%DATADIR%%/tools/PCB2HPGL
@@ -157,10 +171,6 @@
%%DATADIR%%/tools/pcb2ncap.tgz
%%DATADIR%%/tools/tgo2pcb.tcl
%%DATADIR%%/tutorial/tut1.pcb
-bin/MergePCBPS
-bin/Merge_dimPCBPS
-bin/pcb
-bin/pcb-bin
@exec /bin/mkdir -p %D/%%DATADIR%%/newlib/toko
@exec /bin/mkdir -p %D/%%DATADIR%%/newlib/sockets
@exec /bin/mkdir -p %D/%%DATADIR%%/newlib/cypress
--- pcb.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607081931.k68JVtv8028069>