Attachment 143699 Details for Bug 190955 – Added stage support to twms

Added stage support to twms

twms-staging.patch.txt (text/plain), 3.41 KB, created by joe on 2014-06-12 02:48:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2014-06-12 02:48:56 UTC

Size: 3.41 KB

patch

obsolete

>diff --git a/www/twms/Makefile b/www/twms/Makefile
>index 9961f12..682e6fa 100644
>--- a/www/twms/Makefile
>+++ b/www/twms/Makefile
>@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyproj/__init__.py:${PORTSDIR}/graphics/py-pyp
> 		${PYTHON_SITELIBDIR}/web/__init__.py:${PORTSDIR}/www/webpy \
> 		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
> 
>-USE_BZIP2=	yes
>+USES+=		tar:bzip2
> USE_PYTHON=	yes
> NO_BUILD=	yes
> 
>@@ -25,14 +25,14 @@ TWMS_GROUP?=	twms
> TWMS_CACHEDIR?=	/var/cache/twms
> 
> SUB_FILES=	pkg-install pkg-deinstall
>-SUB_LIST+=	USER=${TWMS_USER} GROUP=${TWMS_GROUP} CACHEDIR=${TWMS_CACHEDIR}
>+SUB_LIST+=	USER=${TWMS_USER} GROUP=${TWMS_GROUP} CACHEDIR=${TWMS_CACHEDIR} \
>+		STAGEDIR=${STAGEDIR}
> 
> USE_RC_SUBR=	twms
> 
> USERS=		${TWMS_USER}
> GROUPS=		${TWMS_GROUP}
> 
>-NO_STAGE=	yes
> post-patch:
> 	@${REINPLACE_CMD} -e '1,1 s|/usr/bin/python|/usr/bin/env python|' ${WRKSRC}/twms.py
> 	@${REINPLACE_CMD} -e 's|/etc/twms/twms.conf|${PREFIX}/etc/twms.conf|' ${WRKSRC}/twms/twms.py
>@@ -42,15 +42,12 @@ post-patch:
> 		s|import fetchers|from twms &|' ${WRKSRC}/twms/twms.conf
> 
> do-install:
>-	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/twms
>-	${INSTALL_DATA} ${WRKSRC}/twms/*.py ${PYTHONPREFIX_SITELIBDIR}/twms/
>-	${INSTALL_SCRIPT} ${WRKSRC}/twms.py ${PREFIX}/bin/twms
>-	${MKDIR} ${DATADIR}
>-	${INSTALL_DATA} ${WRKSRC}/*.jpg ${DATADIR}/
>-	${INSTALL_DATA} ${WRKSRC}/twms/twms.conf ${PREFIX}/etc/twms.conf.default
>-	@if [ ! -f ${PREFIX}/etc/twms.conf ]; then \
>-		${CP} -p ${PREFIX}/etc/twms.conf.default ${PREFIX}/etc/twms.conf ; \
>-	fi
>+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/twms
>+	${INSTALL_DATA} ${WRKSRC}/twms/*.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/twms/
>+	${INSTALL_SCRIPT} ${WRKSRC}/twms.py ${STAGEDIR}${PREFIX}/bin/twms
>+	${MKDIR} ${STAGEDIR}${DATADIR}
>+	${INSTALL_DATA} ${WRKSRC}/*.jpg ${STAGEDIR}${DATADIR}/
>+	${INSTALL_DATA} ${WRKSRC}/twms/twms.conf ${STAGEDIR}${PREFIX}/etc/twms.conf.default
> 
> post-install:
> 	@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>diff --git a/www/twms/files/pkg-install.in b/www/twms/files/pkg-install.in
>old mode 100644
>new mode 100755
>index 93c0a09..104fef6
>--- a/www/twms/files/pkg-install.in
>+++ b/www/twms/files/pkg-install.in
>@@ -2,15 +2,14 @@
> 
> USER=%%USER%%
> GROUP=%%GROUP%%
>-CACHEDIR=%%CACHEDIR%%
>+CACHEDIR=%%STAGEDIR%%%%CACHEDIR%%
> 
> if [ "$2" = "POST-INSTALL" ]; then
>-	if [ ! -d "%%CACHEDIR%%" ]; then
>-		mkdir -p "%%CACHEDIR%%/cache" || exit 1
>-		mkdir -p "%%CACHEDIR%%/traces" || exit 1
>-		chown -R "$USER:$GROUP" "%%CACHEDIR%%" || exit 1
>-		chmod -R 0775 "%%CACHEDIR%%" || exit 1
>-	fi
>+        if [ ! -d "%%STAGEDIR%%%%CACHEDIR%%" ]; then
>+                mkdir -p "%%STAGEDIR%%%%CACHEDIR%%/cache" || exit 1
>+                mkdir -p "%%STAGEDIR%%%%CACHEDIR%%/traces" || exit 1
>+                chmod -R 0775 "%%STAGEDIR%%%%CACHEDIR%%" || exit 1
>+        fi
> fi
> 
> exit 0
>diff --git a/www/twms/pkg-plist b/www/twms/pkg-plist
>index 369094c..7c39cd7 100644
>--- a/www/twms/pkg-plist
>+++ b/www/twms/pkg-plist
>@@ -19,5 +19,11 @@ etc/twms.conf.default
> %%DATADIR%%/irs_nxt.jpg
> %%DATADIR%%/yahoo_nxt.jpg
> %%DATADIR%%/yandex_nxt.jpg
>+@exec mkdir -p "/var/cache/twms/cache" || :
>+@exec mkdir -p "/var/cache/twms/traces" || :
>+@exec chown -R "twms:twms" "/var/cache/twms"
> @dirrm %%DATADIR%%
> @dirrm %%PYTHON_SITELIBDIR%%/twms
>+@unexec rmdir "/var/cache/twms/cache" >/dev/null 2>&1 || :
>+@unexec rmdir "/var/cache/twms/traces" >/dev/null 2>&1 || :
>+@unexec rmdir "/var/cache/twms" >/dev/null 2>&1 || :

Actions: View

Attachments on bug 190955: 143699