ports/172033: math/xspread: Update MASTER_SITES

Tue Sep 25 18:10:35 UTC 2012

>Number:         172033
>Category:       ports
>Synopsis:       math/xspread: Update MASTER_SITES
>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:   Tue Sep 25 18:10:34 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES
- Add LICENSE
- Add MAKE_JOBS_SAFE
- Support PLIST_FILES

Remove file:
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/math/xspread/Makefile math/xspread/Makefile

--- /usr/ports/math/xspread/Makefile	2011-09-24 07:24:07.000000000 +0900
+++ math/xspread/Makefile	2012-09-25 03:37:44.000000000 +0900
@@ -1,34 +1,53 @@
-# New ports collection makefile for:	xspread
-# Date created:		28 June 1995
-# Whom:			janek at gaja.ipan.lublin.pl
-#
+# Created by: janek at gaja.ipan.lublin.pl
 # $FreeBSD: ports/math/xspread/Makefile,v 1.19 2011/09/23 22:24:07 amdmi3 Exp $
-#
 
 PORTNAME=	xspread
 PORTVERSION=	3.1.1c
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	# disappeared
+MASTER_SITES=	http://archive.debian.org/%SUBDIR%/ \
+		http://mirror.safehostnet.com/debian-archive/%SUBDIR%/ \
+		http://mirrors.xmission.com/debian-archive/%SUBDIR%/ \
+		http://vos-systems.net/ftp/%SUBDIR%/
+MASTER_SITE_SUBDIR=	debian/dists/potato/main/source/math
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A spreadsheet program for X and terminals
 
+LICENSE=	GPLv2 # (or later)
+
+OPTIONS_DEFINE=	X11 DOCS
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	-I${LOCALBASE}/include
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		xspread.1 pxspread.1
+PORTDOCS=	*
+PLIST_FILES=	bin/pxspread bin/xspread
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
+USE_XORG=	x11
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+.else
+CONFIGURE_ENV+=	ac_cv_header_X11_X_h=no
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^void main|int main|' ${WRKSRC}/psc.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pxspread ${PREFIX}/bin/pxspread
 	${INSTALL_PROGRAM} ${WRKSRC}/xspread ${PREFIX}/bin/xspread
 	${INSTALL_MAN} ${WRKSRC}/pxspread.man ${MANPREFIX}/man/man1/pxspread.1
 	${INSTALL_MAN} ${WRKSRC}/xspread.man ${MANPREFIX}/man/man1/xspread.1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/x/notes ${DOCSDIR}
diff -urN /usr/ports/math/xspread/pkg-plist math/xspread/pkg-plist
--- /usr/ports/math/xspread/pkg-plist	2001-11-05 20:08:02.000000000 +0900
+++ math/xspread/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,65 +0,0 @@
-bin/pxspread
-bin/xspread
-%%PORTDOCS%%share/doc/xspread/README
-%%PORTDOCS%%share/doc/xspread/doc/Sample_Run
-%%PORTDOCS%%share/doc/xspread/doc/final_rpt
-%%PORTDOCS%%share/doc/xspread/doc/last_xspread
-%%PORTDOCS%%share/doc/xspread/doc/prog_rpt
-%%PORTDOCS%%share/doc/xspread/doc/sc.changes
-%%PORTDOCS%%share/doc/xspread/doc/sc.readme
-%%PORTDOCS%%share/doc/xspread/doc/sc.vms_notes
-%%PORTDOCS%%share/doc/xspread/doc/xspread.aux
-%%PORTDOCS%%share/doc/xspread/doc/xspread.dvi
-%%PORTDOCS%%share/doc/xspread/doc/xspread.log
-%%PORTDOCS%%share/doc/xspread/doc/xspread.ps
-%%PORTDOCS%%share/doc/xspread/doc/xspread.tex
-%%PORTDOCS%%share/doc/xspread/doc/xspread.toc
-%%PORTDOCS%%share/doc/xspread/doc/xspread_prog.asc
-%%PORTDOCS%%share/doc/xspread/documents/progress.aux
-%%PORTDOCS%%share/doc/xspread/documents/progress.dvi
-%%PORTDOCS%%share/doc/xspread/documents/progress.log
-%%PORTDOCS%%share/doc/xspread/documents/progress.ps
-%%PORTDOCS%%share/doc/xspread/documents/progress.tex
-%%PORTDOCS%%share/doc/xspread/documents/report.aux
-%%PORTDOCS%%share/doc/xspread/documents/report.dvi
-%%PORTDOCS%%share/doc/xspread/documents/report.log
-%%PORTDOCS%%share/doc/xspread/documents/report.ps
-%%PORTDOCS%%share/doc/xspread/documents/report.tex
-%%PORTDOCS%%share/doc/xspread/notes
-%%PORTDOCS%%share/doc/xspread/sample_files/demo_dates
-%%PORTDOCS%%share/doc/xspread/sample_files/demo_func
-%%PORTDOCS%%share/doc/xspread/sample_files/demo_math
-%%PORTDOCS%%share/doc/xspread/sample_files/demo_matrix
-%%PORTDOCS%%share/doc/xspread/sample_files/demo_strval
-%%PORTDOCS%%share/doc/xspread/sample_files/ex1
-%%PORTDOCS%%share/doc/xspread/sample_files/ex1o
-%%PORTDOCS%%share/doc/xspread/sample_files/ex2
-%%PORTDOCS%%share/doc/xspread/sample_files/ex2o
-%%PORTDOCS%%share/doc/xspread/sample_files/ex3
-%%PORTDOCS%%share/doc/xspread/sample_files/tutorial
-%%PORTDOCS%%share/doc/xspread/tests/Makefile
-%%PORTDOCS%%share/doc/xspread/tests/READ_ME
-%%PORTDOCS%%share/doc/xspread/tests/copy.cmp
-%%PORTDOCS%%share/doc/xspread/tests/copy.input
-%%PORTDOCS%%share/doc/xspread/tests/copy.output
-%%PORTDOCS%%share/doc/xspread/tests/copy.sc
-%%PORTDOCS%%share/doc/xspread/tests/intfunc.cmp
-%%PORTDOCS%%share/doc/xspread/tests/intfunc.input
-%%PORTDOCS%%share/doc/xspread/tests/intfunc.output
-%%PORTDOCS%%share/doc/xspread/tests/intfunc.sc
-%%PORTDOCS%%share/doc/xspread/tests/irr.cmp
-%%PORTDOCS%%share/doc/xspread/tests/irr.input
-%%PORTDOCS%%share/doc/xspread/tests/irr.output
-%%PORTDOCS%%share/doc/xspread/tests/irr.sc
-%%PORTDOCS%%share/doc/xspread/tests/read.cmp
-%%PORTDOCS%%share/doc/xspread/tests/read.data
-%%PORTDOCS%%share/doc/xspread/tests/read.input
-%%PORTDOCS%%share/doc/xspread/tests/read.output
-%%PORTDOCS%%share/doc/xspread/tests/read.sc
-%%PORTDOCS%%share/doc/xspread/tests/tester.sh
-%%PORTDOCS%%share/doc/xspread/tests/txt.sc
-%%PORTDOCS%%@dirrm share/doc/xspread/tests
-%%PORTDOCS%%@dirrm share/doc/xspread/sample_files
-%%PORTDOCS%%@dirrm share/doc/xspread/documents
-%%PORTDOCS%%@dirrm share/doc/xspread/doc
-%%PORTDOCS%%@dirrm share/doc/xspread
>Release-Note:
>Audit-Trail:
>Unformatted:

