Attachment 135952 Details for Bug 181056 – cad_gerbv.diff

[patch] cad_gerbv.diff

cad_gerbv.diff (text/x-diff), 10.24 KB, created by tkato432 on 2013-09-03 18:57:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-09-03 18:57:24 UTC

Size: 10.24 KB

patch

obsolete

>diff -urN /usr/ports/cad/gerbv/Makefile cad/gerbv/Makefile
>--- /usr/ports/cad/gerbv/Makefile	2013-09-03 16:12:08.000000000 +0900
>+++ cad/gerbv/Makefile	2013-09-04 00:00:00.000000000 +0900
>@@ -2,20 +2,23 @@
> # $FreeBSD: head/cad/gerbv/Makefile 326095 2013-09-02 21:32:24Z bapt $
> 
> PORTNAME=	gerbv
>-PORTVERSION=	2.6.0
>-PORTREVISION=	1
>+PORTVERSION=	2.6.1
> CATEGORIES=	cad
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	A Free Gerber Viewer
>+COMMENT=	Gerber file viewer
> 
> LICENSE=	GPLv2
>-LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=        pathfix pkgconfig
>-USE_GNOME=	desktopfileutils gtk20
>-USE_AUTOTOOLS=	libtool
>+OPTIONS_DEFINE=	DOCS EXAMPLES
>+
>+USES=		desktop-file-utils gmake pathfix pkgconfig
>+USE_GNOME=	gtk20
>+USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
>+LIBTOOLIZE_ARGS=--copy --force
>+AUTOMAKE_ARGS=	--add-missing --copy --foreign
>+CONFIGURE_ENV=	ac_aux_dir="."
> USE_LDCONFIG=	yes
> INSTALLS_ICONS=	yes
> 
>@@ -26,37 +29,52 @@
> 
> MAN1=		gerbv.1
> 
>+.include <bsd.port.options.mk>
>+
> post-patch:
>-	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|desktop||g' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e \
>+		's|^AM_NLS|#AM_NLS| ; \
>+		 s|^AM_GNU_GETTEXT|#AM_GNU_GETTEXT| ; \
>+		 /intl\/Makefile/d ; \
>+		 /po\/Makefile/d' ${WRKSRC}/configure.ac
>+	@${REINPLACE_CMD} -e \
>+		'/^SUBDIRS/s|=.*|= src man scheme|' ${WRKSRC}/Makefile.am
>+	@${REINPLACE_CMD} -e \
>+		'/^man_MANS/s|gerbv.ru.1|| ; \
>+		 s|^PO_|#PO_|' ${WRKSRC}/man/Makefile.am
>+	@${REINPLACE_CMD} -e \
>+		'/^pkgconfigdir/s|$$(libdir)|$$(prefix)/libdata|' \
>+		${WRKSRC}/src/Makefile.am
> 
> post-install:
>-	@${MKDIR} ${PREFIX}/share/applications
>-	${INSTALL_DATA} ${WRKSRC}/desktop/gerbv.desktop \
>-		${PREFIX}/share/applications
>+	@${MKDIR} ${DESKTOPDIR}
>+	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} gerbv.desktop \
>+		${DESKTOPDIR})
> 	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps
>-	${INSTALL_DATA} ${WRKSRC}/desktop/gerbv.svg \
>-		${PREFIX}/share/icons/hicolor/scalable/apps
>+	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} gerbv.svg \
>+		${PREFIX}/share/icons/hicolor/scalable/apps)
> .for i in 16 22 24 32 48
> 	@${MKDIR} ${PREFIX}/share/icons/hicolor/${i}x${i}/apps
>-	${INSTALL_DATA} ${WRKSRC}/desktop/gerbv-${i}.png \
>-		${PREFIX}/share/icons/hicolor/${i}x${i}/apps/gerbv.png
>+	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} gerbv-${i}.png \
>+		${PREFIX}/share/icons/hicolor/${i}x${i}/apps/gerbv.png)
> .endfor
>-.if !defined(NOPORTDOCS)
>+.if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/doc/*.fig ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
>+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.fig *.txt \
>+		${DOCSDIR})
> 	@${MKDIR} ${DOCSDIR}/PNG-print
>-	${INSTALL_DATA} ${WRKSRC}/doc/PNG-print/*.jpg ${DOCSDIR}/PNG-print
>-	${INSTALL_DATA} ${WRKSRC}/doc/PNG-print/*.txt ${DOCSDIR}/PNG-print
>+	(cd ${WRKSRC}/doc/PNG-print && ${INSTALL_DATA} *.jpg *.txt \
>+		${DOCSDIR}/PNG-print)
> 	@${MKDIR} ${DOCSDIR}/eagle
>-	${INSTALL_DATA} ${WRKSRC}/doc/eagle/*.pl ${DOCSDIR}/eagle
>-	${INSTALL_DATA} ${WRKSRC}/doc/eagle/*.txt ${DOCSDIR}/eagle
>+	(cd ${WRKSRC}/doc/eagle && ${INSTALL_DATA} *.pl *.txt \
>+		${DOCSDIR}/eagle)
> .endif
>-.if !defined(NOPORTEXAMPLES)
>+.if ${PORT_OPTIONS:MEXAMPLES}
> 	@${MKDIR} ${EXAMPLESDIR}
>-	cd ${WRKSRC}/example && ${FIND} . ! -name "*Makefile*" | \
>-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
>+	@(cd ${WRKSRC}/example && ${FIND} . \
>+		! $ -name "*Makefile*" -or -name ".cvsignore" $ \
>+		| ${CPIO} --quiet -pdm -L -R ${SHAREOWN}:${SHAREGRP} \
>+		${EXAMPLESDIR})
> .endif
>-	-@update-desktop-database
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/cad/gerbv/distinfo cad/gerbv/distinfo
>--- /usr/ports/cad/gerbv/distinfo	2013-06-21 03:47:06.000000000 +0900
>+++ cad/gerbv/distinfo	2013-09-04 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (gerbv-2.6.0.tar.gz) = 5c55425c3493bc8407949be8b4e572434a6b378f5727cc0dcef97dc2e7574dd0
>-SIZE (gerbv-2.6.0.tar.gz) = 2346299
>+SHA256 (gerbv-2.6.1.tar.gz) = 7aa6a2c622dc9ff7acd88411dddf95ae25ae3b5d97020f3ea91e97d82bf0d96c
>+SIZE (gerbv-2.6.1.tar.gz) = 4432481
>diff -urN /usr/ports/cad/gerbv/pkg-descr cad/gerbv/pkg-descr
>--- /usr/ports/cad/gerbv/pkg-descr	2013-06-21 03:47:06.000000000 +0900
>+++ cad/gerbv/pkg-descr	2013-09-04 00:00:00.000000000 +0900
>@@ -16,4 +16,4 @@
> can load all files at the same time and display them "on top of each
> other". You can independently turn them on and off.
> 
>-WWW: http://gerbv.gpleda.org/
>+WWW: http://gerbv.geda-project.org/
>diff -urN /usr/ports/cad/gerbv/pkg-plist cad/gerbv/pkg-plist
>--- /usr/ports/cad/gerbv/pkg-plist	2013-06-21 03:47:06.000000000 +0900
>+++ cad/gerbv/pkg-plist	2013-09-04 00:00:00.000000000 +0900
>@@ -17,6 +17,14 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mentor-BoardStation/README.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mentor-BoardStation/artwork_1.grb
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/am-test/am-test.gbx
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/amacro-ref/1.grb
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/amacro-ref/README.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/amacro-ref/full-ex.grb
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/amacro-ref/gerbv_am_expression_bug.ger
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/amacro-ref/jj1.drl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/amacro-ref/jj1.grb
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/amacro-ref/limit-ex.grb
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/amacro-ref/stp0.grb
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cslk/README.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cslk/cslk.gbx
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cslk/cslk.ps
>@@ -25,6 +33,10 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dan/top_sr.gbx
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eaglecad1/top-cop.gbx
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eaglecad1/top-cop.pdf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ekf/README
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ekf/ekf.gap
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ekf/ekf_08.apt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ekf/l1.off
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ekf2/README.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ekf2/d1.grb
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ekf2/drill0.exc
>@@ -48,6 +60,14 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exposure/README.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exposure/example.grb
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exposure/example.jpg
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hellboard/README
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hellboard/hellboard.back.gbr
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hellboard/hellboard.fab.gbr
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hellboard/hellboard.front.gbr
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hellboard/hellboard.group1.gbr
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hellboard/hellboard.group2.gbr
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hellboard/hellboard.pcb
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hellboard/hellboard.plated-drill.cnc
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jj/README.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jj/l1-1.grb
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jj/l1-2.grb
>@@ -80,6 +100,29 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pick-and-place/LED.xy
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/polarity/6_vbat.gbr
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/polarity/README.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/Assembly_Drawings.pdf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/Final_Artwork_Prints.pdf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/Pick_Place_for_SE_SG_IF_V2.csv
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/Pick_Place_for_SE_SG_IF_V2.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/README.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.DRL
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.DRR
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.GBL
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.GBO
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.GBS
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.GD1
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.GG1
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.GM1
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.GM2
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.GTL
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.GTO
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.GTS
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.LDP
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.REP
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.RUL
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.TXT
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/SE_SG_IF_V2.apr
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protel-pnp/Status_Report.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/README.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/bpB.GP1
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/bpB.png
>@@ -88,6 +131,11 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/trailing/README.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/trailing/cd1r2.1_sieb0.off
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/trailing/cd1r2.1_sieb1.off
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uwe/example-cairo.png
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uwe/example-gdk.png
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uwe/example-viewmate.png
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uwe/example.gbr
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uwe/mail.txt
> %%DATADIR%%/scheme/gerb-debug.scm
> %%DATADIR%%/scheme/gerb-ps.scm
> %%DATADIR%%/scheme/init.scm
>@@ -99,19 +147,24 @@
> share/icons/hicolor/scalable/apps/gerbv.svg
> @dirrm %%DATADIR%%/scheme
> @dirrm %%DATADIR%%
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/uwe
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/trailing
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/thermal
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/protel-pnp
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/polarity
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pick-and-place
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/orcad
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/numpres
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/nollezappare
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/jj
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/hellboard
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/exposure
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ekf2
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ekf
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/eaglecad1
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dan
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cslk
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/amacro-ref
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/am-test
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Mentor-BoardStation
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>@@ -120,5 +173,3 @@
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrmtry share/applications
> @dirrm include/gerbv-%%VERSION%%
>-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 181056: 135950 | 135951 | 135952 | 135953