4 files changed, 67 insertions, 178 deletions

diff --git a/cad/geda-examples/Makefile b/cad/geda-examples/Makefile
index a7a3e23b6b0d..add9b2634e21 100644
--- a/cad/geda-examples/Makefile
+++ b/cad/geda-examples/Makefile
@@ -6,29 +6,24 @@
 #
 
 PORTNAME=	examples
-PORTVERSION=	20070216
+PORTVERSION=	1.4.3
 CATEGORIES=	cad
-MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
-		http://geda.seul.org/devel/${PORTVERSION}/
+MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
+		http://geda.seul.org/release/v1.4/${PORTVERSION}/
 PKGNAMEPREFIX=	geda-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The gEDA's examples
 
-NO_BUILD=	yes
+GNU_CONFIGURE=	yes
 
 EXAMPLESDIR=	${PREFIX}/share/examples/geda
 
 .include <bsd.port.pre.mk>
 
-EXAMPLES!=	${CAT} ${FILESDIR}/examples
-
-do-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	@(cd ${WRKSRC} \
-	 && ${FIND} -d ${EXAMPLES} -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \
-	 && ${FIND} -d ${EXAMPLES} -type f -exec ${INSTALL_DATA} {} \
-	 ${EXAMPLESDIR}/{} \;)
+post-patch:
+	@$(FIND) ${WRKSRC} -name Makefile.in -exec \
+		${REINPLACE_CMD} -e 's,\(^exampledir = \).*,\1${EXAMPLESDIR},g' {} \;
 
 .include <bsd.port.post.mk>
diff --git a/cad/geda-examples/distinfo b/cad/geda-examples/distinfo
index 6ba9926e3eb0..a7309964b045 100644
--- a/cad/geda-examples/distinfo
+++ b/cad/geda-examples/distinfo
@@ -1,3 +1,3 @@
-MD5 (geda-examples-20070216.tar.gz) = 255898ad0f9209bc2e77417272421dad
-SHA256 (geda-examples-20070216.tar.gz) = d2237dec40d07182d59106dcc3c51b681be0e9802fe3045624534e6ce73d87cb
-SIZE (geda-examples-20070216.tar.gz) = 253241
+MD5 (geda-examples-1.4.3.tar.gz) = 923fe9d9cc843b5eb7b26c91ad0ef2d4
+SHA256 (geda-examples-1.4.3.tar.gz) = 38a7c6d39a8b298aa1baeadaf7a174ed2ae6397ef227f19cb0bee22757b6e553
+SIZE (geda-examples-1.4.3.tar.gz) = 263072
diff --git a/cad/geda-examples/files/examples b/cad/geda-examples/files/examples
deleted file mode 100644
index 9819ef04971c..000000000000
--- a/cad/geda-examples/files/examples
+++ /dev/null
@@ -1,74 +0,0 @@
-README
-RF_Amp
-RF_Amp/5980-2396E.pdf
-RF_Amp/MSA-2643.cir
-RF_Amp/MSA-2643.sch
-RF_Amp/Q1.cir
-RF_Amp/Q1.sch
-RF_Amp/Q2.cir
-RF_Amp/Q2.sch
-RF_Amp/README
-RF_Amp/Simulation.cmd
-RF_Amp/gafrc
-RF_Amp/model
-RF_Amp/model/BJTM1_Q1.mod
-RF_Amp/model/BJTM1_Q2.mod
-RF_Amp/model/DiodeM1_Q1.mod
-RF_Amp/model/DiodeM1_Q2.mod
-RF_Amp/model/DiodeM2_Q1.mod
-RF_Amp/model/DiodeM2_Q2.mod
-RF_Amp/model/DiodeM3_Q1.mod
-RF_Amp/model/DiodeM3_Q2.mod
-RF_Amp/sym
-RF_Amp/sym/BJT_Model.sym
-RF_Amp/sym/Q_Model.sym
-RF_Amp/sym/spice-subcircuit-IO-1.sym
-RF_Amp/sym/spice-subcircuit-LL-1.sym
-TwoStageAmp
-TwoStageAmp/Simulation.cmd
-TwoStageAmp/TwoStageAmp.sch
-TwoStageAmp/gafrc
-TwoStageAmp/spice.netlist
-TwoStageAmp/sym
-TwoStageAmp/sym/transistor.sym
-gTAG
-gTAG/7414-1.sym
-gTAG/ChangeLog
-gTAG/README
-gTAG/attribs
-gTAG/commonrc
-gTAG/copyleft.sym
-gTAG/crdist.sh
-gTAG/cy7c64603-52nc.sym
-gTAG/gTAG-consio.ps
-gTAG/gTAG-consio.sch
-gTAG/gTAG-consio.sym
-gTAG/gTAG-jtagio.ps
-gTAG/gTAG-jtagio.sch
-gTAG/gTAG-jtagio.sym
-gTAG/gTAG-pcb.net
-gTAG/gTAG-psu.ps
-gTAG/gTAG-psu.sch
-gTAG/gTAG-psu.sym
-gTAG/gTAG-ucont.ps
-gTAG/gTAG-ucont.sch
-gTAG/gTAG-ucont.sym
-gTAG/gTAG.bom
-gTAG/gTAG.ps
-gTAG/gTAG.sch
-gTAG/gnetlistrc
-gTAG/gschemrc
-gTAG/gschlasrc
-gTAG/max882.sym
-gTAG/sn75240pw.sym
-lightning_detector
-lightning_detector/bom
-lightning_detector/bom.readme
-lightning_detector/gafrc
-lightning_detector/lightning.net
-lightning_detector/lightning.pcb
-lightning_detector/lightning.sch
-lightning_detector/lightning.sch.bom
-lightning_detector/sym
-lightning_detector/sym/2N4401.sym
-lightning_detector/sym/2N4403.sym
diff --git a/cad/geda-examples/pkg-plist b/cad/geda-examples/pkg-plist
index 0892005ad1b3..968318442bc7 100644
--- a/cad/geda-examples/pkg-plist
+++ b/cad/geda-examples/pkg-plist
@@ -1,91 +1,59 @@
+%%EXAMPLESDIR%%/2N3904.mod
+%%EXAMPLESDIR%%/2N4401.sym
+%%EXAMPLESDIR%%/2N4403.sym
+%%EXAMPLESDIR%%/5980-2396E.pdf
+%%EXAMPLESDIR%%/7414-1.sym
+%%EXAMPLESDIR%%/BJTM1_Q1.mod
+%%EXAMPLESDIR%%/BJTM1_Q2.mod
+%%EXAMPLESDIR%%/BJT_Model.sym
+%%EXAMPLESDIR%%/DiodeM1_Q1.mod
+%%EXAMPLESDIR%%/DiodeM1_Q2.mod
+%%EXAMPLESDIR%%/DiodeM2_Q1.mod
+%%EXAMPLESDIR%%/DiodeM2_Q2.mod
+%%EXAMPLESDIR%%/DiodeM3_Q1.mod
+%%EXAMPLESDIR%%/DiodeM3_Q2.mod
+%%EXAMPLESDIR%%/MSA-2643.cir
+%%EXAMPLESDIR%%/MSA-2643.sch
+%%EXAMPLESDIR%%/Q1.cir
+%%EXAMPLESDIR%%/Q1.sch
+%%EXAMPLESDIR%%/Q2.cir
+%%EXAMPLESDIR%%/Q2.sch
+%%EXAMPLESDIR%%/Q_Model.sym
 %%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/RF_Amp/5980-2396E.pdf
-%%EXAMPLESDIR%%/RF_Amp/MSA-2643.cir
-%%EXAMPLESDIR%%/RF_Amp/MSA-2643.sch
-%%EXAMPLESDIR%%/RF_Amp/Makefile.am
-%%EXAMPLESDIR%%/RF_Amp/Makefile.in
-%%EXAMPLESDIR%%/RF_Amp/Q1.cir
-%%EXAMPLESDIR%%/RF_Amp/Q1.sch
-%%EXAMPLESDIR%%/RF_Amp/Q2.cir
-%%EXAMPLESDIR%%/RF_Amp/Q2.sch
-%%EXAMPLESDIR%%/RF_Amp/README
-%%EXAMPLESDIR%%/RF_Amp/Simulation.cmd
-%%EXAMPLESDIR%%/RF_Amp/gafrc
-%%EXAMPLESDIR%%/RF_Amp/model/BJTM1_Q1.mod
-%%EXAMPLESDIR%%/RF_Amp/model/BJTM1_Q2.mod
-%%EXAMPLESDIR%%/RF_Amp/model/DiodeM1_Q1.mod
-%%EXAMPLESDIR%%/RF_Amp/model/DiodeM1_Q2.mod
-%%EXAMPLESDIR%%/RF_Amp/model/DiodeM2_Q1.mod
-%%EXAMPLESDIR%%/RF_Amp/model/DiodeM2_Q2.mod
-%%EXAMPLESDIR%%/RF_Amp/model/DiodeM3_Q1.mod
-%%EXAMPLESDIR%%/RF_Amp/model/DiodeM3_Q2.mod
-%%EXAMPLESDIR%%/RF_Amp/model/Makefile.am
-%%EXAMPLESDIR%%/RF_Amp/model/Makefile.in
-%%EXAMPLESDIR%%/RF_Amp/sym/BJT_Model.sym
-%%EXAMPLESDIR%%/RF_Amp/sym/Makefile.am
-%%EXAMPLESDIR%%/RF_Amp/sym/Makefile.in
-%%EXAMPLESDIR%%/RF_Amp/sym/Q_Model.sym
-%%EXAMPLESDIR%%/RF_Amp/sym/spice-subcircuit-IO-1.sym
-%%EXAMPLESDIR%%/RF_Amp/sym/spice-subcircuit-LL-1.sym
-%%EXAMPLESDIR%%/TwoStageAmp/Makefile.am
-%%EXAMPLESDIR%%/TwoStageAmp/Makefile.in
-%%EXAMPLESDIR%%/TwoStageAmp/Simulation.cmd
-%%EXAMPLESDIR%%/TwoStageAmp/TwoStageAmp.sch
-%%EXAMPLESDIR%%/TwoStageAmp/gafrc
-%%EXAMPLESDIR%%/TwoStageAmp/spice.netlist
-%%EXAMPLESDIR%%/TwoStageAmp/sym/Makefile.am
-%%EXAMPLESDIR%%/TwoStageAmp/sym/Makefile.in
-%%EXAMPLESDIR%%/TwoStageAmp/sym/transistor.sym
-%%EXAMPLESDIR%%/gTAG/7414-1.sym
-%%EXAMPLESDIR%%/gTAG/ChangeLog
-%%EXAMPLESDIR%%/gTAG/Makefile.am
-%%EXAMPLESDIR%%/gTAG/Makefile.in
-%%EXAMPLESDIR%%/gTAG/README
-%%EXAMPLESDIR%%/gTAG/attribs
-%%EXAMPLESDIR%%/gTAG/commonrc
-%%EXAMPLESDIR%%/gTAG/copyleft.sym
-%%EXAMPLESDIR%%/gTAG/crdist.sh
-%%EXAMPLESDIR%%/gTAG/cy7c64603-52nc.sym
-%%EXAMPLESDIR%%/gTAG/gTAG-consio.ps
-%%EXAMPLESDIR%%/gTAG/gTAG-consio.sch
-%%EXAMPLESDIR%%/gTAG/gTAG-consio.sym
-%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.ps
-%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.sch
-%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.sym
-%%EXAMPLESDIR%%/gTAG/gTAG-pcb.net
-%%EXAMPLESDIR%%/gTAG/gTAG-psu.ps
-%%EXAMPLESDIR%%/gTAG/gTAG-psu.sch
-%%EXAMPLESDIR%%/gTAG/gTAG-psu.sym
-%%EXAMPLESDIR%%/gTAG/gTAG-ucont.ps
-%%EXAMPLESDIR%%/gTAG/gTAG-ucont.sch
-%%EXAMPLESDIR%%/gTAG/gTAG-ucont.sym
-%%EXAMPLESDIR%%/gTAG/gTAG.bom
-%%EXAMPLESDIR%%/gTAG/gTAG.ps
-%%EXAMPLESDIR%%/gTAG/gTAG.sch
-%%EXAMPLESDIR%%/gTAG/gnetlistrc
-%%EXAMPLESDIR%%/gTAG/gschemrc
-%%EXAMPLESDIR%%/gTAG/gschlasrc
-%%EXAMPLESDIR%%/gTAG/max882.sym
-%%EXAMPLESDIR%%/gTAG/sn75240pw.sym
-%%EXAMPLESDIR%%/lightning_detector/Makefile.am
-%%EXAMPLESDIR%%/lightning_detector/Makefile.in
-%%EXAMPLESDIR%%/lightning_detector/bom
-%%EXAMPLESDIR%%/lightning_detector/bom.readme
-%%EXAMPLESDIR%%/lightning_detector/gafrc
-%%EXAMPLESDIR%%/lightning_detector/lightning.net
-%%EXAMPLESDIR%%/lightning_detector/lightning.pcb
-%%EXAMPLESDIR%%/lightning_detector/lightning.sch
-%%EXAMPLESDIR%%/lightning_detector/lightning.sch.bom
-%%EXAMPLESDIR%%/lightning_detector/sym/2N4401.sym
-%%EXAMPLESDIR%%/lightning_detector/sym/2N4403.sym
-%%EXAMPLESDIR%%/lightning_detector/sym/Makefile.am
-%%EXAMPLESDIR%%/lightning_detector/sym/Makefile.in
-@dirrm %%EXAMPLESDIR%%/lightning_detector/sym
-@dirrm %%EXAMPLESDIR%%/lightning_detector
-@dirrm %%EXAMPLESDIR%%/gTAG
-@dirrm %%EXAMPLESDIR%%/TwoStageAmp/sym
-@dirrm %%EXAMPLESDIR%%/TwoStageAmp
-@dirrm %%EXAMPLESDIR%%/RF_Amp/sym
-@dirrm %%EXAMPLESDIR%%/RF_Amp/model
-@dirrm %%EXAMPLESDIR%%/RF_Amp
+%%EXAMPLESDIR%%/Simulation.cmd
+%%EXAMPLESDIR%%/TwoStageAmp.sch
+%%EXAMPLESDIR%%/attribs
+%%EXAMPLESDIR%%/bom
+%%EXAMPLESDIR%%/bom.readme
+%%EXAMPLESDIR%%/copyleft.sym
+%%EXAMPLESDIR%%/crdist.sh
+%%EXAMPLESDIR%%/cy7c64603-52nc.sym
+%%EXAMPLESDIR%%/gTAG-consio.ps
+%%EXAMPLESDIR%%/gTAG-consio.sch
+%%EXAMPLESDIR%%/gTAG-consio.sym
+%%EXAMPLESDIR%%/gTAG-jtagio.ps
+%%EXAMPLESDIR%%/gTAG-jtagio.sch
+%%EXAMPLESDIR%%/gTAG-jtagio.sym
+%%EXAMPLESDIR%%/gTAG-pcb.net
+%%EXAMPLESDIR%%/gTAG-psu.ps
+%%EXAMPLESDIR%%/gTAG-psu.sch
+%%EXAMPLESDIR%%/gTAG-psu.sym
+%%EXAMPLESDIR%%/gTAG-ucont.ps
+%%EXAMPLESDIR%%/gTAG-ucont.sch
+%%EXAMPLESDIR%%/gTAG-ucont.sym
+%%EXAMPLESDIR%%/gTAG.bom
+%%EXAMPLESDIR%%/gTAG.ps
+%%EXAMPLESDIR%%/gTAG.sch
+%%EXAMPLESDIR%%/gafrc
+%%EXAMPLESDIR%%/gnetlistrc
+%%EXAMPLESDIR%%/lightning.net
+%%EXAMPLESDIR%%/lightning.pcb
+%%EXAMPLESDIR%%/lightning.sch
+%%EXAMPLESDIR%%/lightning.sch.bom
+%%EXAMPLESDIR%%/max882.sym
+%%EXAMPLESDIR%%/sn75240pw.sym
+%%EXAMPLESDIR%%/spice-subcircuit-IO-1.sym
+%%EXAMPLESDIR%%/spice-subcircuit-LL-1.sym
+%%EXAMPLESDIR%%/spice.netlist
+%%EXAMPLESDIR%%/transistor.sym
 @dirrmtry %%EXAMPLESDIR%%