aboutsummaryrefslogtreecommitdiffstats
path: root/astro
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-03-14 04:04:24 +0800
committermarcus <marcus@FreeBSD.org>2004-03-14 04:04:24 +0800
commit5e6c9fecffd60fe374391f96749151b74a40259b (patch)
tree1af8a82d70c6ad7839196a5ace299348b17a8343 /astro
parent3364de47524348ac00f66ea817225ab8ec3b97a7 (diff)
downloadfreebsd-ports-gnome-5e6c9fecffd60fe374391f96749151b74a40259b.tar.gz
freebsd-ports-gnome-5e6c9fecffd60fe374391f96749151b74a40259b.tar.zst
freebsd-ports-gnome-5e6c9fecffd60fe374391f96749151b74a40259b.zip
Change the method of pkg-message generation to fix potential breakage with
non-default paths. PR: 64066 Submitted by: maintainer
Diffstat (limited to 'astro')
-rw-r--r--astro/gdesklets-goodweather/Makefile3
-rw-r--r--astro/gdesklets-goodweather/files/pkg-message.in (renamed from astro/gdesklets-goodweather/pkg-message)0
-rw-r--r--astro/gdesklets-weather/Makefile3
-rw-r--r--astro/gdesklets-weather/files/pkg-message.in (renamed from astro/gdesklets-weather/pkg-message)0
4 files changed, 4 insertions, 2 deletions
diff --git a/astro/gdesklets-goodweather/Makefile b/astro/gdesklets-goodweather/Makefile
index c785e30bf58c..0ba052422a07 100644
--- a/astro/gdesklets-goodweather/Makefile
+++ b/astro/gdesklets-goodweather/Makefile
@@ -31,7 +31,6 @@ SKINS= liquid um weather.com
do-build:
@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
- @${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%NAME%%|${NAME}|g' > ${PKGMESSAGE}
do-install:
@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
@@ -53,6 +52,8 @@ do-install:
post-install:
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
+ @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%NAME%%|${NAME}|g' \
+ ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/astro/gdesklets-goodweather/pkg-message b/astro/gdesklets-goodweather/files/pkg-message.in
index 682e55e18eb1..682e55e18eb1 100644
--- a/astro/gdesklets-goodweather/pkg-message
+++ b/astro/gdesklets-goodweather/files/pkg-message.in
diff --git a/astro/gdesklets-weather/Makefile b/astro/gdesklets-weather/Makefile
index 041e5884d1d5..b0e3e27eca3b 100644
--- a/astro/gdesklets-weather/Makefile
+++ b/astro/gdesklets-weather/Makefile
@@ -27,7 +27,6 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
do-build:
@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
- @${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%NAME%%|${NAME}|g' > ${PKGMESSAGE}
do-install:
@${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx
@@ -43,6 +42,8 @@ do-install:
post-install:
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
+ @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%NAME%%|${NAME}|g' \
+ ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/astro/gdesklets-weather/pkg-message b/astro/gdesklets-weather/files/pkg-message.in
index 0acaea019a00..0acaea019a00 100644
--- a/astro/gdesklets-weather/pkg-message
+++ b/astro/gdesklets-weather/files/pkg-message.in