Index: head/cad/geda/Makefile =================================================================== --- head/cad/geda/Makefile (revision 416641) +++ head/cad/geda/Makefile (revision 416642) @@ -1,62 +1,51 @@ # Created by: Vanilla I. Shu # $FreeBSD$ 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+ LIB_DEPENDS= libstroke.so:devel/libstroke \ libguile.so:lang/guile RUN_DEPENDS= gawk:lang/gawk\ m4>=1.4.11:devel/m4 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 \ gschem/docs/*.dox gsymcheck/docs/*.dox \ gnetlist/docs/*.dox USE_GNOME= gtk20 USE_PERL5= run GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 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]* \ geda-gschem-[0-9]* geda-netlist-[0-9]* geda-symbols-[0-9]* \ geda-symcheck-[0-9]* geda-utils-[0-9]* libgeda-[0-9]* 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 Index: head/cad/geda/files/patch-build-tools-icon-theme-installer =================================================================== --- head/cad/geda/files/patch-build-tools-icon-theme-installer (nonexistent) +++ head/cad/geda/files/patch-build-tools-icon-theme-installer (revision 416642) @@ -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=. Property changes on: head/cad/geda/files/patch-build-tools-icon-theme-installer ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/geda/files/patch-configure =================================================================== --- head/cad/geda/files/patch-configure (nonexistent) +++ head/cad/geda/files/patch-configure (revision 416642) @@ -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 Property changes on: head/cad/geda/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/geda/files/patch-libgeda__src__scheme_object.c =================================================================== --- head/cad/geda/files/patch-libgeda__src__scheme_object.c (revision 416641) +++ head/cad/geda/files/patch-libgeda__src__scheme_object.c (revision 416642) @@ -1,13 +1,13 @@ ---- 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. */ -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); Index: head/cad/geda/files/patch-utils__src__gsch2pcb.c =================================================================== --- head/cad/geda/files/patch-utils__src__gsch2pcb.c (revision 416641) +++ head/cad/geda/files/patch-utils__src__gsch2pcb.c (revision 416642) @@ -1,18 +1,18 @@ ---- 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 */ - m4_pcbdir = g_strconcat (pcbdata_path, "/pcb/m4", NULL); + m4_pcbdir = g_strconcat (pcbdata_path, "/m4", NULL); } else { /* Use the default value passed in from the configure script * instead of trying to hard code a value which is very * likely wrong */ - m4_pcbdir = g_strconcat (PCBDATADIR, "/pcb/m4", NULL); + m4_pcbdir = g_strconcat (PCBDATADIR, "/m4", NULL); } default_m4_pcbdir = g_strdup (m4_pcbdir);