pkgsrc-WIP-changes archive

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

freeswitch-core: Makefile: Fix dirs and permissions statements



Module Name:	pkgsrc-wip
Committed By:	Angel M. Adames <angelmadames%gmail.com@localhost>
Pushed By:	angelmadames
Date:		Thu Jun 1 12:41:30 2017 -0400
Changeset:	3db16d1668c79defe361b6ec9167b877f90dab5b

Modified Files:
	freeswitch-core/Makefile

Log Message:
freeswitch-core: Makefile: Fix dirs and permissions statements

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

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

diffstat:
 freeswitch-core/Makefile | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diffs:
diff --git a/freeswitch-core/Makefile b/freeswitch-core/Makefile
index 3f794d3345..5b26962cc4 100644
--- a/freeswitch-core/Makefile
+++ b/freeswitch-core/Makefile
@@ -17,8 +17,7 @@ LIBTOOL_OVERRIDE=	libtool */libtool */*/libtool */*/*/libtool
 USE_LANGUAGES=  	c c++
 USE_TOOLS+=     	automake autoconf gmake perl pkg-config
 
-BUILD_DEFS+=		VARBASE FREESWITCH_CONFDIR FREESWITCH_DATADIR \
-			FREESWITCH_SHAREDIR FREESWITCH_LOGDIR FREESWITCH_DBDIR
+BUILD_DEFS+=		VARBASE
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/bin
@@ -159,29 +158,35 @@ REPLACE_PERL+=	docs/phrase/phrase.pl
 
 RCD_SCRIPTS=            freeswitch
 
-INSTALLATION_DIRS+= 	${PREFIX}/freeswitch
-INSTALLATION_DIRS+= 	${PREFIX}/freeswitch/modules
-INSTALLATION_DIRS+= 	${PREFIX}/freeswitch/sounds
-INSTALLATION_DIRS+= 	${PREFIX}/freeswitch/recordings
+INSTALLATION_DIRS+= 	share/freeswitch/scripts
+INSTALLATION_DIRS+=	share/freeswitch/grammar
+INSTALLATION_DIRS+= 	freeswitch/modules
+INSTALLATION_DIRS+= 	freeswitch/sounds
+INSTALLATION_DIRS+= 	freeswitch/recordings
 
 .include "../../mk/bsd.prefs.mk"
 
-FREESWITCH_USER?=		freeswitch
-FREESWITCH_GROUP?=		freeswitch
-PKG_GROUPS=			${FREESWITCH_GROUP}
-PKG_USERS=			${FREESWITCH_USER}:${FREESWITCH_GROUP}
-PKG_GECOS.${FREESWITCH_USER}=	FreeSWITCH
-PKG_GROUPS_VARS=		FREESWITCH_GROUP
-PKG_USERS_VARS=			FREESWITCH_USER
+FS_USER?=		freeswitch
+FS_GROUP?=		freeswitch
+PKG_USERS_VARS=		FS_USER
+PKG_GROUPS_VARS=	FS_GROUP
+PKG_GROUPS=		${FS_GROUP}
+PKG_USERS=		${FS_USER}:${FS_GROUP}
 
-FREESWITCH_CONFDIR?=	${PREFIX}/etc/freeswitch
-FREESWITCH_DATADIR?=	${PREFIX}/freeswitch
-FREESWITCH_SHAREDIR?=	${PREFIX}/share/freeswitch
-FREESWITCH_LOGDIR?=	${VARBASE}/log/freeswitch
-FREESWITCH_DBDIR?=	${VARBASE}/db/freeswitch
+PKG_GECOS.${FS_USER}=		FreeSWITCH
+PKG_SHELL.${NGINX_USER}=	${NOLOGIN}
+
+MAKE_DIRS+=		${VARBASE}/log/freeswitch
+MAKE_DIRS+=		${VARBASE}/db/freeswitch
+MAKE_DIRS_PERMS+=	${VARBASE}/log/freeswitch ${FS_USER} ${FS_GROUP} 0644
+MAKE_DIRS_PERMS+=	${VARBASE}/db/freeswitch ${FS_USER} ${FS_GROUP} 0755
+OWN_DIRS=		${PREFIX}/freeswitch
+OWN_DIRS+=		${PREFIX}/share/freeswitch
+OWN_DIRS_PERMS+=	${PREFIX}/freeswitch ${FS_USER} ${FS_GROUP} 0755
+OWN_DIRS_PERMS+=	${PREFIX}/share/freeswitch ${FS_USER} ${FS_GROUP} 0755
 
 PKG_SYSCONFSUBDIR=      freeswitch
-PKG_SYSCONFDIR_PERMS=   ${FREESWITCH_USER} ${FREESWITCH_GROUP} 0755
+PKG_SYSCONFDIR_PERMS=   ${FS_USER} ${FS_GROUP} 0755
 
 BUILDLINK_TRANSFORM+= rm:-Werror
 


Home | Main Index | Thread Index | Old Index