- Update MASTER_SITES

- Add LICENSE
- Add MAKE_JOBS_SAFE
- Use PLIST_FILES instead of pkg-plist

While I'm here:
- Fix COMMENT
- Fix build when X11=on
- Make sure that configure script looks for x11 libs in right
  dir when LOCALBASE != /usr/local

PR:		ports/172033
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Feature safe:	yes

2 files changed, 33 insertions, 75 deletions

diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index cabcd1d5a1d2..fe2f923f8695 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -1,34 +1,57 @@
-# New ports collection makefile for:	xspread
-# Date created:		28 June 1995
-# Whom:			janek@gaja.ipan.lublin.pl
-#
+# Created by: janek@gaja.ipan.lublin.pl
 # $FreeBSD$
-#
 
 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@FreeBSD.org
-COMMENT=	A spreadsheet program for X and terminals
+COMMENT=	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 xau xdmcp xt
+LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		xcb:${PORTSDIR}/x11/libxcb
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+.else
+CONFIGURE_ENV+=	ac_cv_header_X11_X_h=no
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} 's|/usr/local/lib/libXt|${LOCALBASE}/lib/libXt|' \
+		${WRKSRC}/configure
+	@${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 --git a/math/xspread/pkg-plist b/math/xspread/pkg-plist
deleted file mode 100644
index a3d2c50bfcb5..000000000000
--- a/math/xspread/pkg-plist
+++ /dev/null
@@ -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