Index: head/cad/lepton-eda/Makefile =================================================================== --- head/cad/lepton-eda/Makefile (revision 508161) +++ head/cad/lepton-eda/Makefile (revision 508162) @@ -1,95 +1,95 @@ # $FreeBSD$ PORTNAME= lepton-eda PORTVERSION= 1.9.7 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONSUFFIX= -20181211 CATEGORIES= cad MAINTAINER= graahnul.grom@gmail.com COMMENT= Lepton Electronic Design Automation LICENSE= GPLv2+ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgc-threaded.so:devel/boehm-gc-threaded \ libguile-2.2.so:lang/guile2 \ libpng.so:graphics/png \ libstroke.so:devel/libstroke USES= autoreconf desktop-file-utils gettext-tools gnome \ groff:build libtool localbase makeinfo pathfix perl5 \ pkgconfig python:2.7,run shared-mime-info shebangfix USE_GITHUB= yes USE_GNOME= cairo gtk20 USE_LDCONFIG= yes SHEBANG_FILES= utils/scripts/lepton-tragesym \ utils/scripts/lepton-archive.py \ utils/gxyrs/lepton-xyrs.pl \ utils/scripts/gschupdate \ utils/scripts/gsymupdate \ utils/scripts/lepton-pcb_backannotate \ utils/scripts/lepton-refdes_renum \ utils/scripts/lepton-symfix \ examples/lightning_detector/bom \ contrib/scripts/mk_char_tab.pl \ contrib/scripts/pads_backannotate \ contrib/scripts/sarlacc_sym PORTEXAMPLES= examples/* GNU_CONFIGURE= yes INSTALL_TARGET= install-strip INSTALLS_ICONS= yes INFO= lepton-scheme OPTIONS_DEFINE= DOCS EXAMPLES NLS OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime # work around for errors while running # build-tools/icon-theme-installer: # # Cannot find 'install -m 0644'; You probably want to pass -x ${INSTALL_DATA} # # NOTE: in the error message above (I wanted to show it # verbatim), INSTALL_DATA actually is enclosed in # parenthesis, not in curly brackets. # I had to change it to appease portlint(1), which does # not ignore comments in makefiles. # # for 3 dirs (attrib/data, liblepton/data, schematic/data) # the following lines should be in the generated Makefile: # # INSTALL = /usr/bin/install -c # INSTALL_DATA = ${INSTALL} -m 644 # INSTALL_PROGRAM = ${INSTALL} # INSTALL_SCRIPT = ${INSTALL} # # but instead you got: # # INSTALL = /usr/bin/install -c # INSTALL_DATA = install -m 0644 # INSTALL_PROGRAM = install -s -m 555 # INSTALL_SCRIPT = install -m 555 # # this is so only when building a port (when building from # git sources and install to the home folder, there are # no errors) # pre-build: ${REINPLACE_CMD} \ -e 's,^\(INSTALL_DATA = \)install\(.*\),\1$${INSTALL}\2,' \ -e 's,^\(INSTALL_PROGRAM = \)install\(.*\),\1$${INSTALL}\2,' \ -e 's,^\(INSTALL_SCRIPT = \)install\(.*\),\1$${INSTALL}\2,' \ ${WRKSRC}/attrib/data/Makefile \ ${WRKSRC}/liblepton/data/Makefile \ ${WRKSRC}/schematic/data/Makefile .include Index: head/cad/lepton-eda/files/patch-cli_Makefile.am =================================================================== --- head/cad/lepton-eda/files/patch-cli_Makefile.am (nonexistent) +++ head/cad/lepton-eda/files/patch-cli_Makefile.am (revision 508162) @@ -0,0 +1,11 @@ +--- cli/Makefile.am.orig 2019-07-19 17:10:25 UTC ++++ cli/Makefile.am +@@ -28,7 +28,7 @@ lepton_cli_CPPFLAGS = \ + lepton_cli_CFLAGS = \ + $(GCC_CFLAGS) $(MINGW_CFLAGS) $(GUILE_CFLAGS) $(GTK_CFLAGS) \ + $(GDK_PIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(CAIRO_PNG_CFLAGS) \ +- $(CAIRO_PDF_CLAGS) $(CAIRO_PS_CFLAGS) $(CAIRO_SVG_CFLAGS) ++ $(CAIRO_PDF_CLAGS) $(CAIRO_PS_CFLAGS) $(CAIRO_SVG_CFLAGS) $(CFLAGS) + lepton_cli_LDFLAGS = $(GUILE_LIBS) $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(CAIRO_LIBS) \ + $(CAIRO_PNG_LIBS) $(CAIRO_PDF_CLAGS) $(CAIRO_PS_LIBS) $(CAIRO_SVG_LIBS) + lepton_cli_LDADD = \ Property changes on: head/cad/lepton-eda/files/patch-cli_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/cad/lepton-eda/files/patch-liblepton_src_Makefile.am =================================================================== --- head/cad/lepton-eda/files/patch-liblepton_src_Makefile.am (nonexistent) +++ head/cad/lepton-eda/files/patch-liblepton_src_Makefile.am (revision 508162) @@ -0,0 +1,11 @@ +--- liblepton/src/Makefile.am.orig 2019-07-19 16:53:37 UTC ++++ liblepton/src/Makefile.am +@@ -99,7 +99,7 @@ liblepton_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" + -I$(srcdir)/../include -I$(srcdir)/../include/liblepton -I$(top_srcdir) + liblepton_la_CFLAGS = \ + $(GCC_CFLAGS) $(MINGW_CFLAGS) $(GUILE_CFLAGS) $(GLIB_CFLAGS) \ +- $(GDK_PIXBUF_CFLAGS) ++ $(GDK_PIXBUF_CFLAGS) $(CFLAGS) + liblepton_la_LDFLAGS = -version-info $(LIBLEPTON_SHLIB_VERSION) \ + $(WINDOWS_LIBTOOL_FLAGS) $(MINGW_LDFLAGS) $(GUILE_LIBS) \ + $(GLIB_LIBS) $(GDK_PIXBUF_LIBS) Property changes on: head/cad/lepton-eda/files/patch-liblepton_src_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/cad/lepton-eda/files/patch-schematic_src_Makefile.am =================================================================== --- head/cad/lepton-eda/files/patch-schematic_src_Makefile.am (nonexistent) +++ head/cad/lepton-eda/files/patch-schematic_src_Makefile.am (revision 508162) @@ -0,0 +1,11 @@ +--- schematic/src/Makefile.am.orig 2019-07-19 17:20:29 UTC ++++ schematic/src/Makefile.am +@@ -128,7 +128,7 @@ lepton_schematic_CPPFLAGS = -I$(top_srcdir)/liblepton/ + -I$(top_srcdir) -I$(includedir) + lepton_schematic_CFLAGS = $(GCC_CFLAGS) $(LIBSTROKE_CFLAGS) \ + $(MINGW_CFLAGS) \ +- $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS) ++ $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS) $(CFLAGS) + lepton_schematic_LDFLAGS = $(LIBSTROKE_LDFLAGS) $(GLIB_LIBS) $(GTK_LIBS) \ + $(GTHREAD_LIBS) $(GUILE_LIBS) $(MINGW_GUI_LDFLAGS) + lepton_schematic_LDADD = \ Property changes on: head/cad/lepton-eda/files/patch-schematic_src_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property