Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Dec 2012 19:16:54 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/174863: [PATCH] cad/xcircuit: update to 3.7.46, 1, take maintainership, added documentation
Message-ID:  <20121231181657.CE62BB06@hub.freebsd.org>
Resent-Message-ID: <201212311820.qBVIK0Wh004016@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         174863
>Category:       ports
>Synopsis:       [PATCH] cad/xcircuit: update to 3.7.46,1, take maintainership, added documentation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 31 18:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:
- Update to 3.7.46,1
- Take maintainership

Makefile changed:
+DISTFILES=	${PORTNAME}-${DISTVERSION}.tgz \
+		${PORTNAME}.png:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.tgz
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT <-- not needed
-OPTIONS_DEFINE=	EXAMPLES <-- default enabled
+PORTDOCS=

Changed and refined:
+DESKTOP_ENTRIES=
 post-install:
 pkg-plist

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

>Fix:

--- xcircuit-3.7.46,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/cad/xcircuit/Makefile ./Makefile
--- /usr/ports/cad/xcircuit/Makefile	2012-12-23 15:46:48.000000000 +0100
+++ ./Makefile	2012-12-31 19:07:45.000000000 +0100
@@ -2,20 +2,20 @@
 # $FreeBSD: head/cad/xcircuit/Makefile 309387 2012-12-22 11:59:34Z madpilot $
 
 PORTNAME=	xcircuit
-PORTVERSION=	3.7.45
+PORTVERSION=	3.7.46
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/xcircuit/archive/ \
-		http://fossies.org/unix/misc/
-EXTRACT_SUFX=	.tgz
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}.tgz \
+		${PORTNAME}.png:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.tgz
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An X11 drawing program [especially for circuit schematics]
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	X11 drawing program [especially for circuit schematics]
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
-
-OPTIONS_DEFINE=	EXAMPLES
 
 USE_XORG=	xpm xt
 USE_TCL=	85
@@ -33,8 +33,10 @@
 
 MAN1=		xcircuit.1
 
-DESKTOP_ENTRIES="Xcircuit" "${COMMENT}" "${DATADIR}/pixmaps/xcircuit.gif" \
-		"${PORTNAME}" "" "false"
+PORTDOCS=	CHANGES README* TODO
+
+DESKTOP_ENTRIES="Xcircuit" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Development;Electronics;Engineering;" "false"
 
 # Restrict to stable (odd) versions, indicated by the second component.
 PORTSCOUT=	limitw:1,odd
@@ -49,13 +51,16 @@
 		 s|-fpic|-fPIC|g' ${WRKSRC}/configure
 
 post-install:
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/.xcircuitrc ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.lgf ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.lps ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.sim ${EXAMPLESDIR}
+	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 .endif
+	${INSTALL_DATA} ${WRKSRC}/examples/.xcircuitrc* ${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/cad/xcircuit/distinfo ./distinfo
--- /usr/ports/cad/xcircuit/distinfo	2012-12-23 15:46:48.000000000 +0100
+++ ./distinfo	2012-12-31 18:53:40.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (xcircuit-3.7.45.tgz) = a6f6f31ee9c7dd1c08b6e4f616bf16634376c1ee2d5b0a36e08c952e6ba12bc9
-SIZE (xcircuit-3.7.45.tgz) = 1648815
+SHA256 (xcircuit/xcircuit-3.7.46.tgz) = adcdc3b780e0838ae1c38d5e2baa038c119e0bf39178a804248a71aaf05bbcc4
+SIZE (xcircuit/xcircuit-3.7.46.tgz) = 1648857
+SHA256 (xcircuit/xcircuit.png) = c45e081eb28d4c85941aaee61f81d2af2bc0c2e9ceb5f78b266e62572d46318f
+SIZE (xcircuit/xcircuit.png) = 3045
diff -ruN --exclude=CVS /usr/ports/cad/xcircuit/pkg-plist ./pkg-plist
--- /usr/ports/cad/xcircuit/pkg-plist	2012-12-05 00:44:27.000000000 +0100
+++ ./pkg-plist	2012-12-31 19:05:48.000000000 +0100
@@ -2,6 +2,7 @@
 bin/xcircuit
 lib/X11/app-defaults/XCircuit
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/.xcircuitrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.xcircuitrc.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/FlareLED.ps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/USAflag.ps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/analog1.ps
@@ -16,11 +17,15 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fourttest.ps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/logic.sim
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/logic8.ps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panzoom.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/prelude.ps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/systemd1.lgf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/threestage.ps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vcoblock.ps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xc_remote.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xcclock.ps
+share/pixmaps/xcircuit.png
 %%DATADIR%%/analog.lps
 %%DATADIR%%/analoglib2.lps
 %%DATADIR%%/analoglib3.lps
--- xcircuit-3.7.46,1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121231181657.CE62BB06>