Date: Thu, 9 Jun 2016 23:22:43 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416642 - in head/cad/geda: . files Message-ID: <201606092322.u59NMhRB003253@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Thu Jun 9 23:22:43 2016 New Revision: 416642 URL: https://svnweb.freebsd.org/changeset/ports/416642 Log: - Take maintainership. - Some style cleanups. Added: head/cad/geda/files/patch-build-tools-icon-theme-installer (contents, props changed) head/cad/geda/files/patch-configure (contents, props changed) Modified: head/cad/geda/Makefile head/cad/geda/files/patch-libgeda__src__scheme_object.c head/cad/geda/files/patch-utils__src__gsch2pcb.c Modified: head/cad/geda/Makefile ============================================================================== --- head/cad/geda/Makefile Thu Jun 9 23:14:41 2016 (r416641) +++ head/cad/geda/Makefile Thu Jun 9 23:22:43 2016 (r416642) @@ -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=${LOCAL 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> Added: head/cad/geda/files/patch-build-tools-icon-theme-installer ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/geda/files/patch-build-tools-icon-theme-installer Thu Jun 9 23:22:43 2016 (r416642) @@ -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=. Added: head/cad/geda/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/geda/files/patch-configure Thu Jun 9 23:22:43 2016 (r416642) @@ -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 Modified: head/cad/geda/files/patch-libgeda__src__scheme_object.c ============================================================================== --- head/cad/geda/files/patch-libgeda__src__scheme_object.c Thu Jun 9 23:14:41 2016 (r416641) +++ head/cad/geda/files/patch-libgeda__src__scheme_object.c Thu Jun 9 23:22:43 2016 (r416642) @@ -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. */ Modified: head/cad/geda/files/patch-utils__src__gsch2pcb.c ============================================================================== --- head/cad/geda/files/patch-utils__src__gsch2pcb.c Thu Jun 9 23:14:41 2016 (r416641) +++ head/cad/geda/files/patch-utils__src__gsch2pcb.c Thu Jun 9 23:22:43 2016 (r416642) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606092322.u59NMhRB003253>