svn commit: r412074 - in head/math/xspread: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon Mar 28 23:04:07 UTC 2016
Author: amdmi3
Date: Mon Mar 28 23:04:06 2016
New Revision: 412074
URL: https://svnweb.freebsd.org/changeset/ports/412074
Log:
- Add LICENSE_FILE
- Switch to options helpers
- Regenerate patches with `make makepatch`
Modified:
head/math/xspread/Makefile
head/math/xspread/files/patch-Makefile.in
head/math/xspread/files/patch-config_h.in
head/math/xspread/files/patch-interp.c
Modified: head/math/xspread/Makefile
==============================================================================
--- head/math/xspread/Makefile Mon Mar 28 20:59:45 2016 (r412073)
+++ head/math/xspread/Makefile Mon Mar 28 23:04:06 2016 (r412074)
@@ -16,8 +16,7 @@ MAINTAINER= ports at FreeBSD.org
COMMENT= Spreadsheet program for X and terminals
LICENSE= GPLv2+
-
-OPTIONS_DEFINE= X11 DOCS
+LICENSE_FILE= ${WRKSRC}/GNU_GENERAL
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
@@ -27,16 +26,12 @@ PORTDOCS= *
PLIST_FILES= bin/pxspread bin/xspread man/man1/pxspread.1.gz \
man/man1/xspread.1.gz
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= X11 DOCS
-.if ${PORT_OPTIONS:MX11}
-USE_XORG= x11 xau xcb xdmcp xt
-LIB_DEPENDS+= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-.else
-CONFIGURE_ENV+= ac_cv_header_X11_X_h=no
-.endif
+X11_USE= XORG=x11,xau,xcb,xdmcp,xt
+X11_LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
+X11_USES= localbase
+X11_CONFIGURE_ENV_OFF= ac_cv_header_X11_X_h=no
post-patch:
@${REINPLACE_CMD} 's|/usr/local/lib/libXt|${LOCALBASE}/lib/libXt|' \
@@ -49,7 +44,9 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xspread ${STAGEDIR}${PREFIX}/bin/xspread
${INSTALL_MAN} ${WRKSRC}/pxspread.man ${STAGEDIR}${MANPREFIX}/man/man1/pxspread.1
${INSTALL_MAN} ${WRKSRC}/xspread.man ${STAGEDIR}${MANPREFIX}/man/man1/xspread.1
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/x/notes ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${COPYTREE_SHARE} "doc documents sample_files tests" ${STAGEDIR}${DOCSDIR} "! -name *.tmp")
Modified: head/math/xspread/files/patch-Makefile.in
==============================================================================
--- head/math/xspread/files/patch-Makefile.in Mon Mar 28 20:59:45 2016 (r412073)
+++ head/math/xspread/files/patch-Makefile.in Mon Mar 28 23:04:06 2016 (r412074)
@@ -1,5 +1,5 @@
---- Makefile.in.orig Tue Nov 7 11:17:18 1995
-+++ Makefile.in Tue Sep 28 01:41:35 1999
+--- Makefile.in.orig 1995-11-07 02:17:18 UTC
++++ Makefile.in
@@ -1,7 +1,7 @@
# Common prefix for installation directories.
@@ -9,7 +9,7 @@
exec_prefix = $(prefix)
# Where to put the executables.
bindir = $(exec_prefix)/bin
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,7 @@ CC = @CC@
CFLAGS = @CFLAGS@
DEFS = @DEFS@
LIBS = @LIBS@
Modified: head/math/xspread/files/patch-config_h.in
==============================================================================
--- head/math/xspread/files/patch-config_h.in Mon Mar 28 20:59:45 2016 (r412073)
+++ head/math/xspread/files/patch-config_h.in Mon Mar 28 23:04:06 2016 (r412074)
@@ -1,5 +1,5 @@
---- config_h.in.orig Tue Nov 7 11:17:21 1995
-+++ config_h.in Tue Sep 28 04:00:50 1999
+--- config_h.in.orig 1995-11-07 02:17:21 UTC
++++ config_h.in
@@ -12,7 +12,7 @@
#define SAVENAME "SC.SAVE"
Modified: head/math/xspread/files/patch-interp.c
==============================================================================
--- head/math/xspread/files/patch-interp.c Mon Mar 28 20:59:45 2016 (r412073)
+++ head/math/xspread/files/patch-interp.c Mon Mar 28 23:04:06 2016 (r412074)
@@ -1,6 +1,6 @@
---- interp.c.orig Tue Nov 7 03:17:26 1995
-+++ interp.c Fri Mar 10 13:34:37 2000
-@@ -516,7 +516,7 @@
+--- interp.c.orig 1995-11-07 02:17:26 UTC
++++ interp.c
+@@ -516,7 +516,7 @@ int mo, day, yr;
mdays[1] = 28 + (yr%4 == 0);
if (mo < 1 || mo > 12 || day < 1 || day > mdays[--mo] ||
More information about the svn-ports-all
mailing list