Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Mar 2013 01:14:08 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/176824: [PATCH] graphics/pstoedit: Port is now safe with NOPORTDOCS=yes, new patch, take maintainership
Message-ID:  <20130311001411.90B97EB@hub.freebsd.org>
Resent-Message-ID: <201303110020.r2B0K19c064710@freefall.freebsd.org>

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

>Number:         176824
>Category:       ports
>Synopsis:       [PATCH] graphics/pstoedit: Port is now safe with NOPORTDOCS=yes, new patch, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 11 00:20:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10
>Description:

Makefile changed:

Port is now safe with NOPORTDOCS=yes in /etc/make.conf
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+=	PORTDOCS=""
+.else
+PLIST_SUB+=	PORTDOCS="@comment "
+.endif

+	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1/

Changed and refined:
 files/patch-configure
 pkg-descr
 pkg-plist

- Take maintainership

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

portlint -A
looks fine.

port test: clean

>Fix:

--- pstoedit-3.61_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/pstoedit/Makefile ./Makefile
--- /usr/ports/graphics/pstoedit/Makefile	2013-01-14 17:57:12.000000000 +0100
+++ ./Makefile	2013-03-11 00:54:43.000000000 +0100
@@ -3,14 +3,14 @@
 
 PORTNAME=	pstoedit
 PORTVERSION=	3.61
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Convert PostScript to other vector graphic formats
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2
 
 LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd
 
@@ -34,6 +34,12 @@
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+=	PORTDOCS=""
+.else
+PLIST_SUB+=	PORTDOCS="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MMAGICK}
 LIB_DEPENDS+=	Magick++:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IMAGEMAGICK=""
@@ -75,11 +81,13 @@
 	@${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/src/Makefile.in
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/pstoedit.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1/
+
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${DOCSDIR}
 .endif
+
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${EXAMPLESDIR}
diff -ruN --exclude=CVS /usr/ports/graphics/pstoedit/files/patch-configure ./files/patch-configure
--- /usr/ports/graphics/pstoedit/files/patch-configure	2013-01-14 17:57:12.000000000 +0100
+++ ./files/patch-configure	2013-03-11 00:36:12.000000000 +0100
@@ -1,7 +1,7 @@
---- configure.orig	Sat Mar 11 07:38:16 2006
-+++ configure	Sun Mar 26 18:50:43 2006
-@@ -21280,6 +21280,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
+--- configure.orig	2012-08-28 12:49:37.000000000 +0200
++++ configure	2013-03-11 00:33:46.000000000 +0100
+@@ -16274,6 +16274,7 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <stdlib.h>
 +#include <unistd.h>
diff -ruN --exclude=CVS /usr/ports/graphics/pstoedit/pkg-descr ./pkg-descr
--- /usr/ports/graphics/pstoedit/pkg-descr	2013-01-14 17:57:12.000000000 +0100
+++ ./pkg-descr	2013-03-10 23:51:46.000000000 +0100
@@ -1,7 +1,4 @@
 pstoedit converts Postscript(TM) and PDF files to other vector graphic
 formats so that they can be edited graphically.
 
-Copyright (C) 1993 - 2005
-Wolfgang Glunz, wglunz34_AT_pstoedit.net
-
 WWW: http://www.pstoedit.net/
diff -ruN --exclude=CVS /usr/ports/graphics/pstoedit/pkg-plist ./pkg-plist
--- /usr/ports/graphics/pstoedit/pkg-plist	2013-01-14 17:57:12.000000000 +0100
+++ ./pkg-plist	2013-03-10 23:23:13.000000000 +0100
@@ -70,7 +70,7 @@
 %%DATADIR%%/wemf.fmp
 @dirrm %%DATADIR%%/swffonts
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/pstoedit
 @dirrm include/pstoedit
--- pstoedit-3.61_2.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?20130311001411.90B97EB>