ports/53070: Update port: cad/pcb to 1.7.3 and fix unfetchable distfile

[Serge Gagnon]

>Number:         53070
>Category:       ports
>Synopsis:       Update port: cad/pcb to 1.7.3 and fix unfetchable distfile
>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:   Sun Jun 08 18:10:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Serge Gagnon
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix.dyndns.org 4.8-STABLE FreeBSD 4.8-STABLE #0: Tue May 6 22:02:29 EDT 2003 serge at quenix.dyndns.org:/usr/obj/usr/src/sys/OCEAN3 i386


>Description:

	o Fix unfetchable distfile by upgrading this port to 1.7.3
	o I take maintainership of this port

	- Remove all files in the ${FILESDIR} and replace it with
	the files I provide with this PR

	- New files are
	patch-config.h       patch-src-Imakefile  patch-src-error.h

>How-To-Repeat:

http://people.freebsd.org/~fenner/portsurvey/cad.html#pcb

>Fix:


--- patch-pcb-upgrade begins here ---
diff -u /usr/ports/cad/pcb/Makefile ./Makefile
--- /usr/ports/cad/pcb/Makefile	Thu Feb 20 11:52:44 2003
+++ ./Makefile	Sun Jun  8 21:20:30 2003
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	pcb
-PORTVERSION=	1.7
-PORTREVISION=	1
+PORTVERSION=	1.7.3
 CATEGORIES=	cad
-MASTER_SITES=	ftp://ftp.riken.go.jp/pub/Linux/plamo/Plamo-1.4.x/contrib/Electronic/sources/ \
-		ftp://sunsite.tus.ac.jp/pub/archives/linux/jp-linux/plamo/Plamo-1.4.x/contrib/Electronic/sources/
+MASTER_SITES=	http://bach.ece.jhu.edu/~haceaton/pcb/
+DISTFILES=	${PORTNAME}-wip${EXTRACT_SUFX}
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	gagnon__s at videotron.ca
 COMMENT=	X11 interactive printed circuit board layout system
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
diff -u /usr/ports/cad/pcb/distinfo ./distinfo
--- /usr/ports/cad/pcb/distinfo	Thu Nov 25 01:38:05 1999
+++ ./distinfo	Sun Jun  8 05:18:07 2003
@@ -1 +1 @@
-MD5 (pcb-1.7.tar.gz) = 1b4ad00cb3c36ca420f3fa6c9d71a889
+MD5 (pcb-wip.tgz) = 381fe0232b0e3ca12ecd2572a3dda386
Only in .: patch-pcb-upgrade
diff -u /usr/ports/cad/pcb/pkg-plist ./pkg-plist
--- /usr/ports/cad/pcb/pkg-plist	Thu Oct  4 08:35:41 2001
+++ ./pkg-plist	Sun Jun  8 21:06:39 2003
@@ -1,47 +1,47 @@
 bin/pcb
 lib/X11/app-defaults/Pcb
-lib/X11/pcb/default_font
-lib/X11/pcb/pcblib
-lib/X11/pcb/pcblib.contents
-lib/X11/pcb/CreateLibrary.sh
-lib/X11/pcb/CreateLibraryContents.sh
-lib/X11/pcb/ListLibraryContents.sh
-lib/X11/pcb/QueryLibrary.sh
-lib/X11/pcb/m4/TTL_74xx_DIL.m4
-lib/X11/pcb/m4/crystal.m4
-lib/X11/pcb/m4/connector.m4
-lib/X11/pcb/m4/generic.m4
-lib/X11/pcb/m4/linear.m4
-lib/X11/pcb/m4/logic.m4
-lib/X11/pcb/m4/lsi.m4
-lib/X11/pcb/m4/memory.m4
-lib/X11/pcb/m4/optical.m4
-lib/X11/pcb/m4/resistor_array.m4
-lib/X11/pcb/m4/resistor_0.25W.m4
-lib/X11/pcb/m4/texas_inst_amplifier.m4
-lib/X11/pcb/m4/texas_inst_voltage_reg.m4
-lib/X11/pcb/m4/transistor.m4
-lib/X11/pcb/m4/TTL_74xx_DIL.list
-lib/X11/pcb/m4/crystal.list
-lib/X11/pcb/m4/connector.list
-lib/X11/pcb/m4/generic.list
-lib/X11/pcb/m4/linear.list
-lib/X11/pcb/m4/logic.list
-lib/X11/pcb/m4/lsi.list
-lib/X11/pcb/m4/memory.list
-lib/X11/pcb/m4/optical.list
-lib/X11/pcb/m4/common.m4
-lib/X11/pcb/m4/resistor_array.list
-lib/X11/pcb/m4/resistor_0.25W.list
-lib/X11/pcb/m4/texas_inst_amplifier.list
-lib/X11/pcb/m4/texas_inst_voltage_reg.list
-lib/X11/pcb/m4/transistor.list
-lib/X11/pcb/m4/connector.inc
-lib/X11/pcb/m4/dil.inc
-lib/X11/pcb/m4/misc.inc
-lib/X11/pcb/m4/qfp.inc
-lib/X11/pcb/m4/plcc.inc
-lib/X11/pcb/m4/to.inc
+lib/pcb/default_font
+lib/pcb/pcblib
+lib/pcb/pcblib.contents
+lib/pcb/CreateLibrary.sh
+lib/pcb/CreateLibraryContents.sh
+lib/pcb/ListLibraryContents.sh
+lib/pcb/QueryLibrary.sh
+lib/pcb/m4/TTL_74xx_DIL.m4
+lib/pcb/m4/crystal.m4
+lib/pcb/m4/connector.m4
+lib/pcb/m4/generic.m4
+lib/pcb/m4/linear.m4
+lib/pcb/m4/logic.m4
+lib/pcb/m4/lsi.m4
+lib/pcb/m4/memory.m4
+lib/pcb/m4/optical.m4
+lib/pcb/m4/resistor_array.m4
+lib/pcb/m4/resistor_0.25W.m4
+lib/pcb/m4/texas_inst_amplifier.m4
+lib/pcb/m4/texas_inst_voltage_reg.m4
+lib/pcb/m4/transistor.m4
+lib/pcb/m4/TTL_74xx_DIL.list
+lib/pcb/m4/crystal.list
+lib/pcb/m4/connector.list
+lib/pcb/m4/generic.list
+lib/pcb/m4/linear.list
+lib/pcb/m4/logic.list
+lib/pcb/m4/lsi.list
+lib/pcb/m4/memory.list
+lib/pcb/m4/optical.list
+lib/pcb/m4/common.m4
+lib/pcb/m4/resistor_array.list
+lib/pcb/m4/resistor_0.25W.list
+lib/pcb/m4/texas_inst_amplifier.list
+lib/pcb/m4/texas_inst_voltage_reg.list
+lib/pcb/m4/transistor.list
+lib/pcb/m4/connector.inc
+lib/pcb/m4/dil.inc
+lib/pcb/m4/misc.inc
+lib/pcb/m4/qfp.inc
+lib/pcb/m4/plcc.inc
+lib/pcb/m4/to.inc
 @unexec install-info --delete %D/info/pcb.info %D/info/dir
 info/pcb.info
 @exec install-info --section="Utilities" --entry="* PCB: (pcb).		Interactive printed circuit board layout system for X11" %D/info/pcb.info %D/info/dir
@@ -50,5 +50,5 @@
 share/doc/pcb/pcb.ps
 share/doc/pcb/refcard.ps
 @dirrm share/doc/pcb
- at dirrm lib/X11/pcb/m4
- at dirrm lib/X11/pcb
+ at dirrm lib/pcb/m4
+ at dirrm lib/pcb
--- patch-pcb-upgrade ends here ---

--- patch-config.h begins here ---
--- config.h.orig	Sun Jun  8 05:24:52 2003
+++ config.h	Sun Jun  8 05:26:54 2003
@@ -36,15 +36,15 @@
  * (LIBDIR is defined by imake)
  *
  */
-INFODIR = /usr/info
-PCBLIBDIR = $(LIBDIR)/pcb
+INFODIR = ${PREFIX}/info
+PCBLIBDIR = ${PREFIX}/lib/pcb
 DEFAULTFONT = default_font
 DEFAULTLIBRARY = pcblib
 
 /* ----------------------------------------------------------------------
  * the name of GNU m4 (you MUST use GNU m4)
  */
-GNUM4 = m4
+GNUM4 = gm4
 
 /* ----------------------------------------------------------------------
  * BTNMOD determies the modifier key to be used for the
--- patch-config.h ends here ---

--- patch-src-Imakefile begins here ---
--- src/Imakefile.orig	Sun Jun  8 04:21:06 2003
+++ src/Imakefile	Sun Jun  8 04:21:19 2003
@@ -67,7 +67,7 @@
 
 depend:: parse_l.c parse_y.c
 
-ComplexProgramTarget(pcb)
+ComplexProgramTargetNoMan(pcb)
 InstallAppDefaults(Pcb)
 InstallMultipleFlags($(DEFAULTFONT),$(PCBLIBDIR),$(INSTLIBFLAGS))
 
--- patch-src-Imakefile ends here ---

--- patch-src-error.h begins here ---
--- src/error.h.orig	Sun Jun  8 19:04:52 2003
+++ src/error.h	Sun Jun  8 19:06:16 2003
@@ -37,14 +37,8 @@
 #define	STATUS_BREAK	1
 #define	STATUS_ERROR	-1
 
-#if (!defined(__GLIBC__) || (__GLIBC__ < 2) || \
-((__GLIBC__ == 2) && defined(__powerpc__) && (__GLIBC_MINOR__ == 0)))
-void	Message();
-void	MyFatal();
-#else
 void	Message(char *Format, ...);
 void	MyFatal(char *Format, ...);
-#endif
 void	OpenErrorMessage(char *);
 void	PopenErrorMessage(char *);
 void	OpendirErrorMessage(char *);
--- patch-src-error.h ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: