3 files changed, 82 insertions, 88 deletions

diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index c619993efb59..43a3c81541a5 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -8,40 +8,34 @@
 PORTNAME=	xspread
 PORTVERSION=	3.1.1c
 CATEGORIES=	math
-MASTER_SITES=	http://linux.tucows.com/files/x11/office/
-DISTNAME=	${PORTNAME}${PORTVERSION}
+MASTER_SITES=	http://ftp.debian.org/debian/dists/potato/main/source/math/
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
+
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LIBS="-L${X11BASE}/lib"
 
-INSTALL_TARGET=	install install.man
 MAN1=		xspread.1 pxspread.1
 
-XS_DIR=		${PREFIX}/share/xspread
-
-post-extract:
-.for file in config.cache config.h config.log config.status
-	@${RM} ${WRKSRC}/${file} || ${TRUE}
-.endfor
-
-post-install:
+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)
-	@find ${WRKSRC} -name "*.tmp" -delete || ${TRUE}
-	@${MKDIR} ${XS_DIR}
-	@${MKDIR} ${XS_DIR}/doc
-	@${MKDIR} ${XS_DIR}/documents
-	@${MKDIR} ${XS_DIR}/sample_files
-	@${MKDIR} ${XS_DIR}/tests
-	${INSTALL_DATA} ${WRKSRC}/README ${XS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/x/notes ${XS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${XS_DIR}/doc
-	${INSTALL_DATA} ${WRKSRC}/documents/* ${XS_DIR}/documents
-	${INSTALL_DATA} ${WRKSRC}/sample_files/* ${XS_DIR}/sample_files
-	${INSTALL_DATA} ${WRKSRC}/tests/* ${XS_DIR}/tests
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/x/notes ${DOCSDIR}
+.for dir in doc documents sample_files tests
+	@${TAR} -C ${WRKSRC} --exclude '*.tmp' -cf - ${dir} | \
+		${TAR} -C ${DOCSDIR} --unlink -xf -
+.endfor
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/xspread/distinfo b/math/xspread/distinfo
index 7b823d9ae8cf..5ec3d4452c1c 100644
--- a/math/xspread/distinfo
+++ b/math/xspread/distinfo
@@ -1 +1 @@
-MD5 (xspread3.1.1c.tar.gz) = 2bb2eff5db76e5c77d3ef24199f3709d
+MD5 (xspread_3.1.1c.orig.tar.gz) = de8fa66fd8f1e1dac2516de26bf0a465
diff --git a/math/xspread/pkg-plist b/math/xspread/pkg-plist
index fda2e9ff875e..a3d2c50bfcb5 100644
--- a/math/xspread/pkg-plist
+++ b/math/xspread/pkg-plist
@@ -1,65 +1,65 @@
-bin/xspread
 bin/pxspread
-share/xspread/README
-share/xspread/notes
-share/xspread/doc/Sample_Run
-share/xspread/doc/final_rpt
-share/xspread/doc/last_xspread
-share/xspread/doc/prog_rpt
-share/xspread/doc/sc.changes
-share/xspread/doc/sc.readme
-share/xspread/doc/sc.vms_notes
-share/xspread/doc/xspread.aux
-share/xspread/doc/xspread.dvi
-share/xspread/doc/xspread.log
-share/xspread/doc/xspread.ps
-share/xspread/doc/xspread.tex
-share/xspread/doc/xspread.toc
-share/xspread/doc/xspread_prog.asc
-share/xspread/documents/progress.aux
-share/xspread/documents/progress.dvi
-share/xspread/documents/progress.log
-share/xspread/documents/progress.ps
-share/xspread/documents/progress.tex
-share/xspread/documents/report.aux
-share/xspread/documents/report.dvi
-share/xspread/documents/report.log
-share/xspread/documents/report.ps
-share/xspread/documents/report.tex
-share/xspread/sample_files/demo_dates
-share/xspread/sample_files/demo_func
-share/xspread/sample_files/demo_math
-share/xspread/sample_files/demo_matrix
-share/xspread/sample_files/demo_strval
-share/xspread/sample_files/ex1
-share/xspread/sample_files/ex1o
-share/xspread/sample_files/ex2
-share/xspread/sample_files/ex2o
-share/xspread/sample_files/ex3
-share/xspread/sample_files/tutorial
-share/xspread/tests/Makefile
-share/xspread/tests/READ_ME
-share/xspread/tests/copy.cmp
-share/xspread/tests/copy.input
-share/xspread/tests/copy.output
-share/xspread/tests/copy.sc
-share/xspread/tests/intfunc.cmp
-share/xspread/tests/intfunc.input
-share/xspread/tests/intfunc.output
-share/xspread/tests/intfunc.sc
-share/xspread/tests/irr.cmp
-share/xspread/tests/irr.input
-share/xspread/tests/irr.output
-share/xspread/tests/irr.sc
-share/xspread/tests/read.cmp
-share/xspread/tests/read.data
-share/xspread/tests/read.input
-share/xspread/tests/read.output
-share/xspread/tests/read.sc
-share/xspread/tests/tester.sh
-share/xspread/tests/txt.sc
-@dirrm share/xspread/tests
-@dirrm share/xspread/sample_files
-@dirrm share/xspread/documents
-@dirrm share/xspread/doc
-@dirrm share/xspread
+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