- Update to 1.4.3.

PR:		ports/131468 (based on)
Submitted by:	Oliver Lehmann <oliver@freebsd.org>

5 files changed, 81 insertions, 20 deletions

diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 6b62ca672041..ad59ce51d350 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	libgeda
-PORTVERSION=	20070216
-PORTREVISION=	5
+PORTVERSION=	1.4.3
+PORTREVISION=	0
 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}/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The gEDA's tools base utility library
 
-LIB_DEPENDS=	gdgeda.6:${PORTSDIR}/graphics/libgdgeda \
-		guile.20:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
 
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gnomehack
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-gdgeda
+CONFIGURE_ARGS=	--disable-update-mime-database \
+		--disable-update-desktop-database
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
index 06310dcad384..5301dfb0485c 100644
--- a/cad/libgeda/distinfo
+++ b/cad/libgeda/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgeda-20070216.tar.gz) = 4f197eaae6bc6b25521dcc4a47578cf5
-SHA256 (libgeda-20070216.tar.gz) = 1d9cddc81e791b0a0b1897d584e00ee0b035c2d513a24ba5cae26ccd52e551a9
-SIZE (libgeda-20070216.tar.gz) = 625853
+MD5 (libgeda-1.4.3.tar.gz) = f4254f345b5d1a1f3ae4e2e27ae38b0a
+SHA256 (libgeda-1.4.3.tar.gz) = f3687c7308231634619de278b5880cccd6b9b3fc04a4c1b1cf8b2e3131f6f158
+SIZE (libgeda-1.4.3.tar.gz) = 985338
diff --git a/cad/libgeda/files/patch-icon-theme-installer b/cad/libgeda/files/patch-icon-theme-installer
new file mode 100644
index 000000000000..05a9bbec789c
--- /dev/null
+++ b/cad/libgeda/files/patch-icon-theme-installer
@@ -0,0 +1,17 @@
+--- icon-theme-installer.orig	2009-01-28 18:58:56.000000000 +0100
++++ icon-theme-installer	2009-01-28 18:59:24.000000000 +0100
+@@ -108,10 +108,10 @@
+ 	exit 1
+ fi
+ 
+-if test ! -x `echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '`; then
+-	echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
+-	exit 1
+-fi
++#if test ! -x `echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '`; then
++#	echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
++#	exit 1
++#fi
+ 
+ if test -z "$SRC_DIR"; then
+ 	SRC_DIR=.
diff --git a/cad/libgeda/files/patch-libgeda.pc.in b/cad/libgeda/files/patch-libgeda.pc.in
deleted file mode 100644
index 4432b90db330..000000000000
--- a/cad/libgeda/files/patch-libgeda.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- libgeda.pc.in.orig	Wed Jun 28 02:38:37 2006
-+++ libgeda.pc.in	Wed Jun 28 02:38:47 2006
-@@ -7,5 +7,5 @@
- Description: gEDA/gaf's core library 
- Requires: 
- Version: @VERSION@
--Libs: -L${libdir} -lgeda @LIBGEDA_LDFLAGS@
-+Libs: -L${libdir} @LIBGEDA_LDFLAGS@ -lgeda
- Cflags: -I${includedir} @LIBGEDA_CFLAGS@
diff --git a/cad/libgeda/pkg-plist b/cad/libgeda/pkg-plist
index d63b75636e56..dabbfa9136d3 100644
--- a/cad/libgeda/pkg-plist
+++ b/cad/libgeda/pkg-plist
@@ -1,6 +1,7 @@
 include/libgeda/colors.h
 include/libgeda/defines.h
 include/libgeda/funcs.h
+include/libgeda/geda_list.h
 include/libgeda/globals.h
 include/libgeda/i_vars.h
 include/libgeda/libgeda.h
@@ -11,8 +12,59 @@ include/libgeda/struct.h
 lib/libgeda.a
 lib/libgeda.la
 lib/libgeda.so
-lib/libgeda.so.28
+lib/libgeda.so.33
 libdata/pkgconfig/libgeda.pc
 share/geda/prolog.ps
+share/geda/scheme/geda.scm
+share/geda/system-gafrc
+share/icons/hicolor/16x16/mimetypes/application-x-geda-gsch2pcb-project-16.png
+share/icons/hicolor/16x16/mimetypes/application-x-geda-schematic-16.png
+share/icons/hicolor/16x16/mimetypes/application-x-geda-symbol-16.png
+share/icons/hicolor/22x22/mimetypes/application-x-geda-gsch2pcb-project-22.png
+share/icons/hicolor/22x22/mimetypes/application-x-geda-schematic-22.png
+share/icons/hicolor/22x22/mimetypes/application-x-geda-symbol-22.png
+share/icons/hicolor/24x24/mimetypes/application-x-geda-gsch2pcb-project-24.png
+share/icons/hicolor/24x24/mimetypes/application-x-geda-schematic-24.png
+share/icons/hicolor/24x24/mimetypes/application-x-geda-symbol-24.png
+share/icons/hicolor/32x32/mimetypes/application-x-geda-gsch2pcb-project-32.png
+share/icons/hicolor/32x32/mimetypes/application-x-geda-schematic-32.png
+share/icons/hicolor/32x32/mimetypes/application-x-geda-symbol-32.png
+share/icons/hicolor/48x48/mimetypes/application-x-geda-gsch2pcb-project-48.png
+share/icons/hicolor/48x48/mimetypes/application-x-geda-schematic-48.png
+share/icons/hicolor/48x48/mimetypes/application-x-geda-symbol-48.png
+share/icons/hicolor/scalable/mimetypes/application-x-geda-gsch2pcb-project.svg
+share/icons/hicolor/scalable/mimetypes/application-x-geda-schematic.svg
+share/icons/hicolor/scalable/mimetypes/application-x-geda-symbol.svg
+share/locale/de_DE/LC_MESSAGES/libgeda33.mo
+share/locale/en_GB/LC_MESSAGES/libgeda33.mo
+share/locale/es_ES/LC_MESSAGES/libgeda33.mo
+share/locale/nl_NL/LC_MESSAGES/libgeda33.mo
+share/mime/packages/libgeda.xml
+share/mimelnk/application/x-geda-gsch2pcb-project.desktop
+share/mimelnk/application/x-geda-schematic.desktop
+share/mimelnk/application/x-geda-symbol.desktop
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/mime/packages
+@dirrmtry share/mime
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/icons/hicolor/scalable/mimetypes
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/48x48/mimetypes
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/mimetypes
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/mimetypes
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/mimetypes
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/mimetypes
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/geda/scheme
 @dirrmtry share/geda
 @dirrm include/libgeda