4 files changed, 61 insertions, 25 deletions

diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index 59fb883ec9ea..d9863f6461d6 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gschem
-PORTVERSION=	20070216
-PORTREVISION=	2
+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}
 
@@ -18,14 +17,18 @@ MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The gEDA's electronic schematic capture tool
 
 RUN_DEPENDS=	${LOCALBASE}/share/geda/sym:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.28:${PORTSDIR}/cad/libgeda
+LIB_DEPENDS=	geda.33:${PORTSDIR}/cad/libgeda
 
 DOCSDIR=	${PREFIX}/share/doc/geda
 DATADIR=	${PREFIX}/share/geda
 
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ARGS=	--enable-gdgeda --with-docdir=${DOCSDIR}
+INSTALLS_ICONS=	yes
+CONFIGURE_ARGS=	--enable-gdgeda --with-docdir=${DOCSDIR} \
+		--disable-update-mime-database \
+		--disable-update-desktop-database
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/cad/geda-gschem/distinfo b/cad/geda-gschem/distinfo
index b7432a9a98f3..231a19021a63 100644
--- a/cad/geda-gschem/distinfo
+++ b/cad/geda-gschem/distinfo
@@ -1,3 +1,3 @@
-MD5 (geda-gschem-20070216.tar.gz) = 82e26c1de51482332eaf2a77e3368e29
-SHA256 (geda-gschem-20070216.tar.gz) = 16523902b679315be8af3b0426034055637725923472b42bf32f642a4d219bf4
-SIZE (geda-gschem-20070216.tar.gz) = 1053241
+MD5 (geda-gschem-1.4.3.tar.gz) = 76eef656ba4e27c6083fa29b3a5dfb08
+SHA256 (geda-gschem-1.4.3.tar.gz) = 6952601966e0f28b9436286178a488849a78da1581c282944d2be34e9a09eec7
+SIZE (geda-gschem-1.4.3.tar.gz) = 1145038
diff --git a/cad/geda-gschem/files/patch-icon-theme-installer b/cad/geda-gschem/files/patch-icon-theme-installer
new file mode 100644
index 000000000000..05a9bbec789c
--- /dev/null
+++ b/cad/geda-gschem/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/geda-gschem/pkg-plist b/cad/geda-gschem/pkg-plist
index 424815d3dd2e..a225cbb228a3 100644
--- a/cad/geda-gschem/pkg-plist
+++ b/cad/geda-gschem/pkg-plist
@@ -1,4 +1,6 @@
 bin/gschem
+bin/gschemdoc
+share/applications/geda-gschem.desktop
 %%DATADIR%%/bitmap/gschem-alignment_bottomcenter.png
 %%DATADIR%%/bitmap/gschem-alignment_bottomleft.png
 %%DATADIR%%/bitmap/gschem-alignment_bottomright.png
@@ -41,6 +43,7 @@ bin/gschem
 %%DATADIR%%/gschem-lightbg
 %%DATADIR%%/scheme/auto-place-attribs.scm
 %%DATADIR%%/scheme/auto-uref.scm
+%%DATADIR%%/scheme/default-attrib-positions.scm
 %%DATADIR%%/scheme/generate_netlist.scm
 %%DATADIR%%/scheme/gschem.scm
 %%DATADIR%%/scheme/image.scm
@@ -49,22 +52,35 @@ bin/gschem
 %%DATADIR%%/scheme/print-NB-attribs.scm
 %%DATADIR%%/scheme/print.scm
 %%DATADIR%%/system-gschemrc
-%%NLS%%share/locale/de_DE/LC_MESSAGES/geda-gschem.mo
-%%NLS%%share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
-%%NLS%%share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
-%%NLS%%share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
-%%NLS%%share/locale/ja_JP/LC_MESSAGES/geda-gschem.mo
-%%NLS%%share/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/geda-gschem.mo
-%%NLS%%@dirrmtry share/locale/nl_NL/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl_NL
-%%NLS%%@dirrmtry share/locale/ja_JP/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja_JP
-%%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it_IT
-%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de_DE
+share/icons/hicolor/48x48/apps/geda-gschem-48.png
+share/icons/hicolor/scalable/apps/geda-gschem.svg
+share/locale/af_ZA/LC_MESSAGES/geda-gschem.mo
+share/locale/de_DE/LC_MESSAGES/geda-gschem.mo
+share/locale/en_GB/LC_MESSAGES/geda-gschem.mo
+share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
+share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
+share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
+share/locale/ja_JP/LC_MESSAGES/geda-gschem.mo
+share/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
+share/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
+share/locale/ru/LC_MESSAGES/geda-gschem.mo
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/af_ZA/LC_MESSAGES
+@dirrmtry share/locale/af_ZA
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrmtry %%DATADIR%%/scheme
 @dirrmtry %%DATADIR%%/bitmap
 @dirrmtry %%DATADIR%%
+@dirrmtry share/applications