svn commit: r365808 - in head/cad/geda: . files

[John Marino]

Author: marino
Date: Sat Aug 23 20:27:55 2014
New Revision: 365808
URL: http://svnweb.freebsd.org/changeset/ports/365808
QAT: https://qat.redports.org/buildarchive/r365808/

Log:
  cad/geda: Unbreak on FreeBSD 11
  
  PR:		192786
  Submitted by:	Ports Fury

Added:
  head/cad/geda/files/
  head/cad/geda/files/patch-libgeda__src__scheme_object.c   (contents, props changed)
Modified:
  head/cad/geda/Makefile

Modified: head/cad/geda/Makefile
==============================================================================
--- head/cad/geda/Makefile	Sat Aug 23 20:24:56 2014	(r365807)
+++ head/cad/geda/Makefile	Sat Aug 23 20:27:55 2014	(r365808)
@@ -3,7 +3,7 @@
 
 PORTNAME=	geda
 PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://ftp.geda-project.org/geda-gaf/stable/%SUBDIR%/
@@ -19,10 +19,8 @@ LIB_DEPENDS=	libstroke.so:${PORTSDIR}/de
 		libguile.so:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
 
-OPTIONS_DEFINE=	DOCS
-
-USES=		desktop-file-utils gettext gmake pathfix libtool perl5 \
-		pkgconfig shared-mime-info shebangfix
+USES=		desktop-file-utils gettext gmake libtool pathfix perl5 \
+		pkgconfig python:run shared-mime-info shebangfix
 SHEBANG_FILES=	examples/lightning_detector/bom libgeda/docs/*.dox \
 		utils/gxyrs/*.pl utils/scripts/* \
 		utils/docs/*.dox gattrib/docs/*.dox \
@@ -30,9 +28,9 @@ SHEBANG_FILES=	examples/lightning_detect
 		gnetlist/docs/*.dox
 USE_GNOME=	gtk20
 USE_PERL5=	run
-USE_PYTHON_RUN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libstroke=${LOCALBASE}
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
@@ -50,7 +48,7 @@ CONFLICTS=	geda-docs-[0-9]* geda-example
 
 PORTSCOUT=	limitw:1,even
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 .for dir in gattrib gschem libgeda

Added: head/cad/geda/files/patch-libgeda__src__scheme_object.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/geda/files/patch-libgeda__src__scheme_object.c	Sat Aug 23 20:27:55 2014	(r365808)
@@ -0,0 +1,13 @@
+--- libgeda/src/scheme_object.c.orig
++++ libgeda/src/scheme_object.c
+@@ -1986,8 +1986,8 @@
+  * \param filename_s  New filename for \a obj_s.
+  * \return \a obj_s.
+  */
+-SCM_DEFINE (set_picture_data_vector_x, "%set-picture-data/vector!",
+-            3, 0, 0, (SCM obj_s, SCM data_s, SCM filename_s),
++SCM_DEFINE (set_picture_data_vector_x, "%set-picture-data/vector!", 3, 0, 0,
++            (SCM obj_s, SCM data_s, SCM filename_s),
+             "Set a picture object's data from a vector.")
+ {
+   SCM vec_s = scm_any_to_s8vector (data_s);