Attachment 153632 Details for Bug 197786 – alternative version

[patch] alternative version

pspp_misc.diff (text/plain), 2.61 KB, created by Jan Beich on 2015-02-28 23:58:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-02-28 23:58:51 UTC

Size: 2.61 KB

patch

obsolete

>commit 6417db9 (HEAD, land)
>Author: Jan Beich <jbeich@FreeBSD.org>
>Date:   Sat Feb 28 20:29:36 2015 +0000
>
>    - Install more DOCS [1]
>    - Install Emacs mode
>    - Simplify INSTALL_TARGET
>    - Unbreak build when NLS=off
>    - Pass maintainership [1]
>    
>    PR:		197786
>    Submitted by:	Carlos Jacobo Puga Medina <cpm@fbsd.es> [1]
>---
> math/pspp/Makefile  | 20 +++++++++++++++++---
> math/pspp/pkg-plist |  1 +
> 2 files changed, 18 insertions(+), 3 deletions(-)
>
>diff --git math/pspp/Makefile math/pspp/Makefile
>index 3f3158d..efc5eca 100644
>--- math/pspp/Makefile
>+++ math/pspp/Makefile
>@@ -3,10 +3,11 @@
> 
> PORTNAME=	pspp
> PORTVERSION=	0.8.4
>+PORTREVISION=	1
> CATEGORIES=	math
> MASTER_SITES=	GNU
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	cpm@fbsd.es
> COMMENT=	Program for statistical analysis of sampled data
> 
> LICENSE=	GPLv3
>@@ -21,6 +22,7 @@ USE_PERL5=	build
> GNU_CONFIGURE=	yes
> MAKE_ARGS=	MAKEINFO="${LOCALBASE}/bin/makeinfo" \
> 		XMLLINT="${LOCALBASE}/bin/xmllint"
>+INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -28,6 +30,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> 
> PLIST_SUB=	VERSION="${PORTVERSION}"
> 
>+PORTDOCS=	AUTHORS ChangeLog NEWS ONEWS README THANKS TODO
> INFO=		pspp pspp-dev
> 
> OPTIONS_DEFINE=		DOCS GUI NLS PGSQL
>@@ -38,10 +41,10 @@ GUI_RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
> GUI_USES=		desktop-file-utils
> GUI_USE=		gnome=gtksourceview2,libglade2
> GUI_CONFIGURE_WITH=	cairo gui gui-tools
>-GUI_INSTALL_TARGET=	install-strip install-icons install-ext-icons
>-GUI_INSTALL_TARGET_OFF=	install-strip
>+GUI_INSTALL_TARGET=	install-icons install-ext-icons
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
>+NLS_MAKE_ARGS_OFF=	POFILES=""
> PGSQL_USES=		pgsql
> PGSQL_CONFIGURE_WITH=	libpq
> 
>@@ -55,4 +58,15 @@ post-patch:
> 	@${REINPLACE_CMD} -e \
> 		's|: $$(INSTALL_DATA_HOOKS)|:|' ${WRKSRC}/Makefile.in
> 
>+post-install:
>+	${INSTALL_DATA} ${WRKSRC}/pspp-mode.el \
>+		${STAGEDIR}${PREFIX}/share/emacs/site-lisp
>+.if ${PORT_OPTIONS:MGUI}
>+	${RM} -r ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/mimetypes
>+.endif
>+.if ${PORT_OPTIONS:MDOCS}
>+	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
>+		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
>+.endif
>+
> .include <bsd.port.mk>
>diff --git math/pspp/pkg-plist math/pspp/pkg-plist
>index e9355ce..6c4daa0 100644
>--- math/pspp/pkg-plist
>+++ math/pspp/pkg-plist
>@@ -17,6 +17,7 @@ man/man1/pspp-dump-sav.1.gz
> %%GUI%%share/appdata/pspp.appdata.xml
> %%GUI%%share/applications/pspp.desktop
> %%PORTDOCS%%%%DOCSDIR%%/pspp.xml
>+share/emacs/site-lisp/pspp-mode.el
> %%GUI%%share/glade3/catalogs/psppire.xml
> %%GUI%%share/glade3/pixmaps/16x16/psppire-acr.png
> %%GUI%%share/glade3/pixmaps/16x16/psppire-dialog.png

Actions: View | Diff

Attachments on bug 197786: 153144 | 153492 | 153632