svn commit: r398581 - in head/audio/ufmcontrol-i18n: . files

[Nicola Vitale]

Author: nivit
Date: Sun Oct  4 16:17:20 2015
New Revision: 398581
URL: https://svnweb.freebsd.org/changeset/ports/398581

Log:
  - Support newer libedit by using different name for a constant
    (fixes build on current)
  - Switch to USES=libedit as suggested by stage-qa:
  
  http://poudriere.amdmi3.ru/data/10-amd64-default/failures_all_2015_09_28/logs/errors/ufmcontrol-i18n-0.3.5.log
  
  - Fix indentation
  - Set DATADIR, fixing xufmrc installation. Without that, incorrect DATADIR is
    created, and xufmrc is installed AS (as opposed to `into') share/ufmcontrol.
  
  PR:	203490
  Submitted by:	amdmi3

Added:
  head/audio/ufmcontrol-i18n/files/
  head/audio/ufmcontrol-i18n/files/patch-src_bin_input.c   (contents, props changed)
Modified:
  head/audio/ufmcontrol-i18n/Makefile
  head/audio/ufmcontrol-i18n/pkg-plist

Modified: head/audio/ufmcontrol-i18n/Makefile
==============================================================================
--- head/audio/ufmcontrol-i18n/Makefile	Sun Oct  4 16:07:03 2015	(r398580)
+++ head/audio/ufmcontrol-i18n/Makefile	Sun Oct  4 16:17:20 2015	(r398581)
@@ -1,21 +1,23 @@
 # Created by: Nicola Vitale <nivit at users.sourceforge.net>
 # $FreeBSD$
 
-PORTNAME=		ufmcontrol-i18n
-PORTVERSION=		0.3.5
-CATEGORIES=		audio
-MASTER_SITES=		SF/ufmcontrol/${PORTNAME}/${PORTVERSION}
+PORTNAME=	ufmcontrol-i18n
+PORTVERSION=	0.3.5
+PORTREVISION=	1
+CATEGORIES=	audio
+MASTER_SITES=	SF/ufmcontrol-i18n/${PORTNAME}/${PORTVERSION}
+
+MAINTAINER=	nivit at FreeBSD.org
+COMMENT=	USB radio control utility
+
+RUN_DEPENDS=	snack>=2.2.10_4:${PORTSDIR}/audio/snack
+
+USES=		libedit tk:wrapper,run
+USE_LDCONFIG=	yes
+MAKE_ENV=	NO_PROFILE=yes
+DATADIR=	${PREFIX}/share/ufmcontrol
 
-MAINTAINER=		nivit at FreeBSD.org
-COMMENT=		USB radio control utility
-
-RUN_DEPENDS=		snack>=2.2.10_4:${PORTSDIR}/audio/snack
-
-USES=			tk:wrapper,run
-USE_LDCONFIG=		yes
-MAKE_ENV=		NO_PROFILE=yes
-
-OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFINE=	DOCS
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}

Added: head/audio/ufmcontrol-i18n/files/patch-src_bin_input.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/ufmcontrol-i18n/files/patch-src_bin_input.c	Sun Oct  4 16:17:20 2015	(r398581)
@@ -0,0 +1,11 @@
+--- src/bin/input.c.orig	2014-08-06 20:09:27 UTC
++++ src/bin/input.c
+@@ -51,7 +51,7 @@ input(int *cmd)
+ 				#if __FreeBSD_version >= 500000
+ 					&he,
+ 				#endif
+-					H_EVENT, 100);
++					H_SETSIZE, 100);
+ 				el_set(el, EL_HIST, history, hist);
+ 				el_set(el, EL_EDITOR, "emacs");
+ 				el_set(el, EL_PROMPT, ufmcontrol_prompt);

Modified: head/audio/ufmcontrol-i18n/pkg-plist
==============================================================================
--- head/audio/ufmcontrol-i18n/pkg-plist	Sun Oct  4 16:07:03 2015	(r398580)
+++ head/audio/ufmcontrol-i18n/pkg-plist	Sun Oct  4 16:17:20 2015	(r398581)
@@ -66,4 +66,4 @@ share/nls/sv_SE.ISO8859-1/ufmcontrol.cat
 share/nls/sv_SE.ISO8859-15/ufmcontrol.cat
 share/nls/tr_TR.ISO8859-9/ufmcontrol.cat
 share/nls/uk_UA.ISO8859-5/ufmcontrol.cat
-share/ufmcontrol
+%%DATADIR%%/xufmrc