pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

espeak: Adjust data permissions and minor cleanups



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun May 27 13:39:04 2018 +0200
Changeset:	52f26a6be6c8a022f002982bb41ff817b8c56a02

Modified Files:
	espeak/Makefile
Removed Files:
	espeak/TODO

Log Message:
espeak: Adjust data permissions and minor cleanups

 - Adjust data permissions in the post-install phase
 - Inject DATADIR via MAKE_FLAGS. We already do that for PREFIX
   (and this avoid possible headaches in `make patch; mkpatches; mkpatches -c'
   cycles)
 - Do not replace PREFIX in SUBST `datadir' class and only replace the hardcoded
   path of DATADIR in speech.h file
 - Delete the TODO, all entries addressed

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=52f26a6be6c8a022f002982bb41ff817b8c56a02

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 espeak/Makefile | 8 ++++++--
 espeak/TODO     | 3 ---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs:
diff --git a/espeak/Makefile b/espeak/Makefile
index ba212e7b5f..5fd715b4cd 100644
--- a/espeak/Makefile
+++ b/espeak/Makefile
@@ -17,14 +17,18 @@ USE_TOOLS+=	gmake
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	DATADIR=${PREFIX}/share/espeak-data
 
 SUBST_CLASSES+=		datadir
 SUBST_MESSAGE.datadir=	Replacing hardcoded DATADIR path
 SUBST_STAGE.datadir=	post-patch
-SUBST_VARS.datadir=	PREFIX
-SUBST_FILES.datadir=	Makefile speech.h
+SUBST_FILES.datadir=	speech.h
 SUBST_SED.datadir=	-e 's|/usr/share|${PREFIX}/share|'
 
+post-install:
+	cd ${WRKSRC} && ${FIND} ${DESTDIR}${PREFIX}/share -type f \
+	    -exec ${CHMOD} ${SHAREMODE} {} \;
+
 # Using v18 (v19 will get undefined reference to `Pa_StreamActive')
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/espeak/TODO b/espeak/TODO
deleted file mode 100644
index 263c4f9399..0000000000
--- a/espeak/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- Adjust permission of data files (probably they do not need execute
-  permissions!)
-- Function is tested only on 6.0-ish/i386 for now.


Home | Main Index | Thread Index | Old Index