Attachment 224115 Details for Bug 255063 – Patch updating to 4.3.0

[patch] Patch updating to 4.3.0

pcb-4.3.0,1.diff (text/plain), 6.20 KB, created by Martin Neubauer on 2021-04-14 19:24:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Neubauer

Created: 2021-04-14 19:24:17 UTC

Size: 6.20 KB

patch

obsolete

>diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
>index aab263b56f06..37063811ed99 100644
>--- a/cad/pcb/Makefile
>+++ b/cad/pcb/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Michael Reifenberger <mr@FreeBSD.org>
> 
> PORTNAME=	pcb
>-PORTVERSION=	4.2.0
>-PORTREVISION=	1
>+PORTVERSION=	4.3.0
> PORTEPOCH=	1
> CATEGORIES=	cad
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
>@@ -12,62 +11,64 @@ COMMENT=	X11 interactive printed circuit board layout system
> 
> LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	m4>=1.4.11:devel/m4 \
>-		${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
>-LIB_DEPENDS=	libgd.so:graphics/gd \
>-		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
>-		libfontconfig.so:x11-fonts/fontconfig \
>-		libfreetype.so:print/freetype2
>-RUN_DEPENDS=	m4>=1.4.11:devel/m4 \
>-		${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
>+ONLY_FOR_ARCHS=	i386 amd64
>+ONLY_FOR_ARCHS_REASON=	Uses x86 specific libc functions and has not been ported
> 
>-USES=		gl gmake gnome pkgconfig tk:run shared-mime-info \
>-		desktop-file-utils xorg
>-USE_GL=		gl glu
>-USE_GNOME=	intltool cairo pangox-compat
>-USE_XORG=	x11 xrender xinerama
>+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus \
>+		m4>=1.4.11:devel/m4
>+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2 \
>+		libgd.so:graphics/gd \
>+		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
>+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus \
>+		m4>=1.4.11:devel/m4
> 
>-CONFLICTS=	gts-[0-9]*
>+USES=		desktop-file-utils gl gmake gnome pkgconfig shared-mime-info \
>+		tk:run xorg
>+USE_GL=		gl glu
>+USE_GNOME=	cairo intltool pangox-compat
> INSTALLS_ICONS=	yes
>+USE_XORG=	ice sm x11 xinerama xmu xrender xt
>+
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV+=	INSTALL_DATA="${BSD_INSTALL_DATA}"
> LDFLAGS+=	-lpthread
> 
>-PORTDOCS=	\
>-	pcb.html pcb.pdf refcard.pdf pad.png puller.png thermal.png	\
>-	examples tutorial gcode.png gcode_control_img.png		\
>-	gcode_tool_path.png
>+CONFLICTS=	gts-[0-9]*
>+
>+PORTDOCS=	examples gcode.png gcode_control_img.png gcode_tool_path.png \
>+		pad.png pcb.html pcb.pdf puller.png refcard.pdf thermal.png \
>+		tutorial
> 
>-OPTIONS_DEFINE=	DOCS NLS
>-OPTIONS_SINGLE=	GUI
>-OPTIONS_SINGLE_GUI=MOTIF GTK NONE
>-OPTIONS_DEFAULT=GTK
>+OPTIONS_DEFINE=		DOCS NLS
>+OPTIONS_SINGLE=		GUI
>+OPTIONS_SINGLE_GUI=	GTK MOTIF NONE
> DOCS_CONFIGURE_ENABLE=	doc
> DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
> NLS_CONFIGURE_ENABLE=	nls
>-NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE} \
>-			${ICONV_CONFIGURE_ARG}
>-NLS_CONFIGURE_OFF=	--without-libintl \
>-			--without-iconv
>-NLS_USES=	gettext iconv
>+NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG} \
>+			--with-libintl-prefix=${LOCALBASE}
>+NLS_CONFIGURE_OFF=	--without-iconv \
>+			--without-libintl
>+NLS_USES=		gettext iconv
> .for L in fr nl ru pt_BR
> NLS_PLIST_FILES+=	share/locale/${L}/LC_MESSAGES/pcb.mo
> .endfor
>-MOTIF_DESC=	Motif widgets
>-MOTIF_USES=	motif
>+MOTIF_DESC=		Motif widgets
>+MOTIF_USES=		motif
> MOTIF_CONFIGURE_ON=	--with-gui=lesstif
> MOTIF_CONFIGURE_ENV=	WISH=${WISH}
>-GTK_DESC=	GIMP ToolKit widgets
>-GTK_USE=	GNOME=gtk20
>+GTK_DESC=		GIMP ToolKit widgets
>+GTK_USE=		GNOME=gtk20
> GTK_CONFIGURE_ON=	--with-gui=gtk
> GTK_CONFIGURE_ENV=	WISH=${WISH}
>-NONE_DESC=	No GUI support
>+NONE_DESC=		No GUI support
> NONE_CONFIGURE_ON=	--without-gui
> NONE_CONFIGURE_ENV=	WISH=/usr/bin/true
> 
>-ONLY_FOR_ARCHS=	i386 amd64
>-ONLY_FOR_ARCHS_REASON=	Uses x86 specific libc functions and has not been ported
>+DOCS_INFO=	pcb
> 
>-DOCS_INFO=		pcb
>+post-install:
>+	${MKDIR} ${STAGEDIR}${DATADIR}/newlib/sockets
> 
> .include <bsd.port.mk>
>diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo
>index 45bd2cc4a8dd..4f5f73d01d33 100644
>--- a/cad/pcb/distinfo
>+++ b/cad/pcb/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1552659099
>-SHA256 (pcb-4.2.0.tar.gz) = cd4b36df6747789775812fb433f246d6bd5a27f3a16357d78d9c4c9b59c59a43
>-SIZE (pcb-4.2.0.tar.gz) = 5080228
>+TIMESTAMP = 1618420184
>+SHA256 (pcb-4.3.0.tar.gz) = ae852f46af84aba7f51d813fb916fc7fcdbeea43f7134f150507024e1743fb5e
>+SIZE (pcb-4.3.0.tar.gz) = 5383782
>diff --git a/cad/pcb/files/patch-Makefile.in b/cad/pcb/files/patch-Makefile.in
>index 9cb4042e6862..0feb80a85388 100644
>--- a/cad/pcb/files/patch-Makefile.in
>+++ b/cad/pcb/files/patch-Makefile.in
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	2019-02-02 19:08:13.000000000 +0900
>-+++ Makefile.in	2019-03-15 23:13:00.469139000 +0900
>-@@ -353,11 +353,11 @@
>+--- Makefile.in.orig	2021-02-28 20:49:50 UTC
>++++ Makefile.in
>+@@ -464,11 +464,11 @@ target_alias = @target_alias@
>  top_build_prefix = @top_build_prefix@
>  top_builddir = @top_builddir@
>  top_srcdir = @top_srcdir@
>@@ -11,6 +11,15 @@
>  INTLTOOL_FILES = intltool-extract.in intltool-merge.in  intltool-update.in
> -EXTRA_DIST = config.rpath globalconst.h README.git README.w32 README.win32 icon-theme-installer $(INTLTOOL_FILES)
> +EXTRA_DIST = config.rpath globalconst.h README.git icon-theme-installer $(INTLTOOL_FILES)
>- DISTCLEANFILES = configure.lineno intltool-extract intltool-merge intltool-update po/.intltool-merge-cache
>+ DISTCLEANFILES = configure.lineno intltool-extract intltool-merge intltool-update po/.intltool-merge-cache src/gpcb-menu.res.tmp src/pcb-menu.res.tmp
>  MAINTAINERCLEANFILES = $(INTLTOOL_FILES)
>  ACLOCAL_AMFLAGS = -I m4
>+@@ -518,7 +518,7 @@ config.h: stamp-h1
>+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
>+ 	@rm -f stamp-h1
>+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
>+-$(srcdir)/config.h.in:  $(am__configure_deps) 
>++$(srcdir)/config.h.in:  $(am__configure_deps)
>+ 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
>+ 	rm -f stamp-h1
>+ 	touch $@
>diff --git a/cad/pcb/files/patch-doc-Makefile.in b/cad/pcb/files/patch-doc-Makefile.in
>index b20c8001ea50..70ee654ffa9e 100644
>--- a/cad/pcb/files/patch-doc-Makefile.in
>+++ b/cad/pcb/files/patch-doc-Makefile.in
>@@ -1,9 +1,9 @@
>---- doc/Makefile.in.orig	2019-02-02 19:08:09.000000000 +0900
>-+++ doc/Makefile.in	2019-03-15 23:14:07.557427000 +0900
>-@@ -16,7 +16,7 @@
>- @SET_MAKE@
>- 
>- VPATH = @srcdir@
>+--- doc/Makefile.in.orig	2021-02-28 20:49:50 UTC
>++++ doc/Makefile.in
>+@@ -70,7 +70,7 @@ am__make_running_with_option = \
>+   test $$has_opt = yes
>+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
>+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
> -pkgdatadir = $(datadir)/@PACKAGE@
> +pkgdatadir = $(docdir)
>  pkgincludedir = $(includedir)/@PACKAGE@

Actions: View | Diff

Attachments on bug 255063: 224115