- Take maintainership.

- Some style cleanups.

5 files changed, 36 insertions, 19 deletions

diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 30c530e04bbb..384c9e7c04b9 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -3,13 +3,13 @@
 
 PORTNAME=	geda
 PORTVERSION=	1.8.2
+DISTVERSIONPREFIX=gaf-
 PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	cad
-MASTER_SITES=	http://ftp.geda-project.org/geda-gaf/stable/v${PORTVERSION:R}/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-gaf-${PORTVERSION}
+MASTER_SITES=	http://ftp.geda-project.org/${PORTNAME}-gaf/stable/v${PORTVERSION:R}/${PORTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	GPL Electronic Design Automation tools
 
 LICENSE=	GPLv2+
@@ -34,13 +34,10 @@ CONFIGURE_ARGS=	--with-libstroke=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-gaf
 DATADIR=	${PREFIX}/share/gEDA
-
 INFO=		geda-scheme
 
 CONFLICTS=	geda-docs-[0-9]* geda-examples-[0-9]* geda-gattrib-[0-9]* \
@@ -51,12 +48,4 @@ PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-.for dir in gattrib gschem libgeda
-	@${REINPLACE_CMD} -e \
-		'/-x/s|INSTALL_DATA|INSTALL|' ${WRKSRC}/${dir}/data/Makefile.in
-.endfor
-	@${REINPLACE_CMD} -e \
-		'/OS_LINUX=/s|no|yes|' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/cad/geda/files/patch-build-tools-icon-theme-installer b/cad/geda/files/patch-build-tools-icon-theme-installer
new file mode 100644
index 000000000000..7dbaad9c0714
--- /dev/null
+++ b/cad/geda/files/patch-build-tools-icon-theme-installer
@@ -0,0 +1,17 @@
+--- build-tools/icon-theme-installer.orig	2012-12-17 11:04:20 UTC
++++ build-tools/icon-theme-installer
+@@ -108,10 +108,10 @@ if test ! -x `echo "$MKINSTALLDIRS_EXEC"
+ 	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/files/patch-configure b/cad/geda/files/patch-configure
new file mode 100644
index 000000000000..6b0d73778f53
--- /dev/null
+++ b/cad/geda/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2013-09-25 21:55:35 UTC
++++ configure
+@@ -4876,7 +4876,7 @@ case $host_os in *\ *) host_os=`echo "$h
+   # compat. layer on Windows (Cygwin).
+   OS_WIN32_NATIVE=no
+   OS_CYGWIN=no
+-  OS_LINUX=no
++  OS_LINUX=yes
+   case "$host" in
+     *-*-linux*)
+       OS_LINUX=yes
diff --git a/cad/geda/files/patch-libgeda__src__scheme_object.c b/cad/geda/files/patch-libgeda__src__scheme_object.c
index 2cfdabebc8db..a2fbf47fc9f3 100644
--- a/cad/geda/files/patch-libgeda__src__scheme_object.c
+++ b/cad/geda/files/patch-libgeda__src__scheme_object.c
@@ -1,6 +1,6 @@
---- libgeda/src/scheme_object.c.orig
+--- libgeda/src/scheme_object.c.orig	2013-09-25 20:59:27 UTC
 +++ libgeda/src/scheme_object.c
-@@ -1986,8 +1986,8 @@
+@@ -1986,8 +1986,8 @@ SCM_DEFINE (set_picture_x, "%set-picture
   * \param filename_s  New filename for \a obj_s.
   * \return \a obj_s.
   */
diff --git a/cad/geda/files/patch-utils__src__gsch2pcb.c b/cad/geda/files/patch-utils__src__gsch2pcb.c
index 635b826091f0..80babc415f87 100644
--- a/cad/geda/files/patch-utils__src__gsch2pcb.c
+++ b/cad/geda/files/patch-utils__src__gsch2pcb.c
@@ -1,6 +1,6 @@
---- utils/src/gsch2pcb.c.orig	2013-08-18 08:44:47.000000000 +0200
-+++ utils/src/gsch2pcb.c	2014-11-18 18:53:20.303642614 +0100
-@@ -1397,13 +1397,13 @@
+--- utils/src/gsch2pcb.c.orig	2013-08-18 06:44:47 UTC
++++ utils/src/gsch2pcb.c
+@@ -1397,13 +1397,13 @@ main (gint argc, gchar ** argv)
    pcbdata_path = g_getenv ("PCBDATA");  /* do not free return value */
    if (pcbdata_path != NULL) {
      /* If PCBDATA is set, use the value */