- Fix installdirs to address GEDA directory structure unification

- Fix comment
- Update pkg-desck
- Use %%DOCSDIR%% and %%DATADIR%% macroses
- Bump PORTREVISION
- Mark BROKEN on 4.x
- Rename directory from gnetlist to geda-netlist [2]

PR:		ports/100220, ports/100230 [2]
Submitted by:	maintainer

4 files changed, 141 insertions, 56 deletions

diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index 0b13514befb5..c44006a5b686 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -5,25 +5,37 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnetlist
+PORTNAME=	netlist
 PORTVERSION=	20060123
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
 		http://www.tinkerbox.org/projects/files/gEDA/
-DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
+PKGNAMEPREFIX=	geda-
+DISTNAME=	${PKGNAMEPREFIX}g${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ssedov@mbsd.msk.ru
-COMMENT=	gEDA electronic schematic capture tools, netlister
+COMMENT=	The gEDA's netlister
 
 LIB_DEPENDS=	geda.25:${PORTSDIR}/cad/libgeda
-RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
+RUN_DEPENDS=	${LOCALBASE}/share/geda/sym:${PORTSDIR}/cad/geda-symbols
+
+DATADIR=	${PREFIX}/share/geda
+DOCSDIR=	${PREFIX}/share/doc/geda
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gnetlist.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN=		does not compile on 4.x
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/cad/geda-netlist/files/patch-configure b/cad/geda-netlist/files/patch-configure
new file mode 100644
index 000000000000..af4fb8204248
--- /dev/null
+++ b/cad/geda-netlist/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Thu Jul 13 15:10:52 2006
++++ configure	Thu Jul 13 15:11:01 2006
+@@ -5467,7 +5467,7 @@
+ # gEDA/gaf specify setup start
+ #
+ 
+-DATADIR=gEDA
++DATADIR=geda
+ GEDADATADIR=$datadir/$DATADIR
+ 
+ if eval "test x$opt_rcdir = x"; then
diff --git a/cad/geda-netlist/pkg-descr b/cad/geda-netlist/pkg-descr
index 226afeb7253c..a8239504a047 100644
--- a/cad/geda-netlist/pkg-descr
+++ b/cad/geda-netlist/pkg-descr
@@ -1,3 +1,65 @@
-gnetlist is a tool create netlist from a gschem electronic circuits schematic.
+gnetlist is the netlist extraction/generation program which is part
+of gEDA (GPL Electronic Design Automation) toolset. This program takes a
+schematic for its input and outputs a netlist. gnetlist uses scheme to define
+the output format.
+
+Currently it supports the following backends:
+
+	1) Allegro netlist format (-g allegro)
+
+	2) BAE netlist format (-g bae)
+
+	3) BOM / BOM2 - Bill of Materials (-g bom and -g bom2)
+
+	4) Partslist1,2,3 - More Bill of Materials (-g partslist[1-3])
+
+	5) DRC - Start of a design rule checker (-g drc)
+
+	6) DRC2 - A second design rule checker (-g drc2)
+
+	7) gEDA - native format, mainly used for testing (-g geda)
+
+	8) Gossip netlist format (-g gossip)
+
+	9) PADS netlist format (-g pads)
+
+	10) PCB / PCBboard (-g PCB and -g PCBboard)
+
+	11) gsch2pcb backend (-g gsch2pcb)
+
+	12) ProtelII netlist format (-g protelII)
+
+	13) Spice compatible netlist format (-g spice)
+
+	14) Enhanced spice compatible netlist format (-g spice-sdb)
+
+	15) Switcap netlist format (-g switcap)
+
+	16) Tango netlist format (-g tango)
+
+	17) Verilog code (-g verilog)
+
+	18) VHDL code (-g vhdl)
+
+	19) VIPEC netlist format (-g vipec)
+
+	20) Bartels Autoengineer netlist format (-g bae)
+
+	21) GOSSIP system simulation system netlist format (-g gossip)
+
+	22) MAXASCII netlist format (-g maxascii)
+
+	23) VHDL-AMS netlist format (-g vams)
+
+	24) Futurenet2 netlist format (-g futurenet2 )
+
+	25) SWITCAP switched capacitor simulator netlist format (-g switcap )
+
+	26) RF Cascade netlist format (-g cascade )
+
+	27) RACAL-REDAC netlist format (-g redac )
+
+	28) PCB actions file for forward annotating pin/pad names from
+	schematic to layout (-g pcbpins)
 
 WWW: http://www.geda.seul.org
diff --git a/cad/geda-netlist/pkg-plist b/cad/geda-netlist/pkg-plist
index 92d98afda06a..b0035dc92044 100644
--- a/cad/geda-netlist/pkg-plist
+++ b/cad/geda-netlist/pkg-plist
@@ -2,53 +2,53 @@ bin/gnetlist
 bin/mk_verilog_syms
 bin/sch2eaglepos.sh
 bin/sw2asc
-share/doc/geda-doc/man/gnetlist.html
-share/doc/geda-doc/readmes/README.bom
-share/doc/geda-doc/readmes/README.eagle
-share/doc/geda-doc/readmes/README.pcb
-share/doc/geda-doc/readmes/README.switcap
-share/doc/geda-doc/readmes/README.sysc
-share/doc/geda-doc/readmes/README.verilog
-share/doc/geda-doc/readmes/README.vhdl
-share/doc/geda-doc/readmes/syntax_architecture.txt
-share/doc/geda-doc/readmes/syntax_entity.txt
-share/doc/geda-doc/readmes/vams_mode.txt
-share/gEDA/scheme/gnet-PCB.scm
-share/gEDA/scheme/gnet-PCBboard.scm
-share/gEDA/scheme/gnet-allegro.scm
-share/gEDA/scheme/gnet-bae.scm
-share/gEDA/scheme/gnet-bom.scm
-share/gEDA/scheme/gnet-bom2.scm
-share/gEDA/scheme/gnet-cascade.scm
-share/gEDA/scheme/gnet-drc.scm
-share/gEDA/scheme/gnet-drc2.scm
-share/gEDA/scheme/gnet-eagle.scm
-share/gEDA/scheme/gnet-futurenet2.scm
-share/gEDA/scheme/gnet-geda.scm
-share/gEDA/scheme/gnet-gossip.scm
-share/gEDA/scheme/gnet-gsch2pcb.scm
-share/gEDA/scheme/gnet-maxascii.scm
-share/gEDA/scheme/gnet-pads.scm
-share/gEDA/scheme/gnet-partslist-common.scm
-share/gEDA/scheme/gnet-partslist1.scm
-share/gEDA/scheme/gnet-partslist2.scm
-share/gEDA/scheme/gnet-partslist3.scm
-share/gEDA/scheme/gnet-pcbpins.scm
-share/gEDA/scheme/gnet-protelII.scm
-share/gEDA/scheme/gnet-redac.scm
-share/gEDA/scheme/gnet-spice-sdb.scm
-share/gEDA/scheme/gnet-spice.scm
-share/gEDA/scheme/gnet-switcap.scm
-share/gEDA/scheme/gnet-systemc.scm
-share/gEDA/scheme/gnet-tango.scm
-share/gEDA/scheme/gnet-vams.scm
-share/gEDA/scheme/gnet-verilog.scm
-share/gEDA/scheme/gnet-vhdl.scm
-share/gEDA/scheme/gnet-vipec.scm
-share/gEDA/scheme/gnetlist.scm
-share/gEDA/system-gnetlistrc
-@dirrmtry share/gEDA/scheme
-@dirrmtry share/gEDA
-@dirrmtry share/doc/geda-doc/readmes
-@dirrmtry share/doc/geda-doc/man
-@dirrmtry share/doc/geda-doc
+%%DOCSDIR%%/man/gnetlist.html
+%%DOCSDIR%%/readmes/README.bom
+%%DOCSDIR%%/readmes/README.eagle
+%%DOCSDIR%%/readmes/README.pcb
+%%DOCSDIR%%/readmes/README.switcap
+%%DOCSDIR%%/readmes/README.sysc
+%%DOCSDIR%%/readmes/README.verilog
+%%DOCSDIR%%/readmes/README.vhdl
+%%DOCSDIR%%/readmes/syntax_architecture.txt
+%%DOCSDIR%%/readmes/syntax_entity.txt
+%%DOCSDIR%%/readmes/vams_mode.txt
+%%DATADIR%%/scheme/gnet-PCB.scm
+%%DATADIR%%/scheme/gnet-PCBboard.scm
+%%DATADIR%%/scheme/gnet-allegro.scm
+%%DATADIR%%/scheme/gnet-bae.scm
+%%DATADIR%%/scheme/gnet-bom.scm
+%%DATADIR%%/scheme/gnet-bom2.scm
+%%DATADIR%%/scheme/gnet-cascade.scm
+%%DATADIR%%/scheme/gnet-drc.scm
+%%DATADIR%%/scheme/gnet-drc2.scm
+%%DATADIR%%/scheme/gnet-eagle.scm
+%%DATADIR%%/scheme/gnet-futurenet2.scm
+%%DATADIR%%/scheme/gnet-geda.scm
+%%DATADIR%%/scheme/gnet-gossip.scm
+%%DATADIR%%/scheme/gnet-gsch2pcb.scm
+%%DATADIR%%/scheme/gnet-maxascii.scm
+%%DATADIR%%/scheme/gnet-pads.scm
+%%DATADIR%%/scheme/gnet-partslist-common.scm
+%%DATADIR%%/scheme/gnet-partslist1.scm
+%%DATADIR%%/scheme/gnet-partslist2.scm
+%%DATADIR%%/scheme/gnet-partslist3.scm
+%%DATADIR%%/scheme/gnet-pcbpins.scm
+%%DATADIR%%/scheme/gnet-protelII.scm
+%%DATADIR%%/scheme/gnet-redac.scm
+%%DATADIR%%/scheme/gnet-spice-sdb.scm
+%%DATADIR%%/scheme/gnet-spice.scm
+%%DATADIR%%/scheme/gnet-switcap.scm
+%%DATADIR%%/scheme/gnet-systemc.scm
+%%DATADIR%%/scheme/gnet-tango.scm
+%%DATADIR%%/scheme/gnet-vams.scm
+%%DATADIR%%/scheme/gnet-verilog.scm
+%%DATADIR%%/scheme/gnet-vhdl.scm
+%%DATADIR%%/scheme/gnet-vipec.scm
+%%DATADIR%%/scheme/gnetlist.scm
+%%DATADIR%%/system-gnetlistrc
+@dirrmtry %%DATADIR%%/scheme
+@dirrmtry %%DATADIR%%
+@dirrmtry %%DOCSDIR%%/readmes
+@dirrmtry %%DOCSDIR%%/man
+@dirrmtry %%DOCSDIR%%