ports/64066: Maintainer update: Change the two ports to use the different pkg-message on fly method.

[Jeremy Messenger]

>Number:         64066
>Category:       ports
>Synopsis:       Maintainer update: Change the two ports to use the different pkg-message on fly method.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 10 12:10:10 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Mezz
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ns1.mezzweb.com 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Thu Jan 29
23:14:45 CST 2004 mezz at mezz.mezzweb.com:/usr/obj/usr/src/sys/BSDROCKS i386

>Description:
Change to the better method of pkg-message on fly to avoid the breakable.

Requested by:	marcus

>How-To-Repeat:
n/a

>Fix:
This diff will affect on ports:
	-astro/gdesklets-goodweather
	-astro/gdesklets-weather

--- pkgmessage.diff begins here ---
diff -urN astro/gdesklets-goodweather.orig/Makefile astro/gdesklets-goodweather/Makefile
--- astro/gdesklets-goodweather.orig/Makefile	Wed Feb  4 13:04:20 2004
+++ astro/gdesklets-goodweather/Makefile	Wed Mar 10 13:51:20 2004
@@ -31,7 +31,6 @@
 
 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 @@
 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 -urN astro/gdesklets-goodweather.orig/files/pkg-message.in astro/gdesklets-goodweather/files/pkg-message.in
--- astro/gdesklets-goodweather.orig/files/pkg-message.in	Wed Dec 31 18:00:00 1969
+++ astro/gdesklets-goodweather/files/pkg-message.in	Mon Jan  5 13:04:14 2004
@@ -0,0 +1,18 @@
+##
+To view the README:
+
+	cat %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/README
+	cat %%PREFIX%%/share/gnome/gdesklets/Sensors/%%NAME%%/README
+
+To view the installed applets:
+
+	ls %%PREFIX%%/share/gnome/gdesklets/Displays
+
+To use those applets:
+
+	gdesklets %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/%%NAME%%.display
+
+NOTE: Be sure to login as your user when you use the gdesklets command,
+      as the configuration will be stored in the ~/.gdesklets/ directory
+      and/or gconf database.
+##
diff -urN astro/gdesklets-goodweather.orig/pkg-message astro/gdesklets-goodweather/pkg-message
--- astro/gdesklets-goodweather.orig/pkg-message	Mon Jan  5 13:04:14 2004
+++ astro/gdesklets-goodweather/pkg-message	Wed Dec 31 18:00:00 1969
@@ -1,18 +0,0 @@
-##
-To view the README:
-
-	cat %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/README
-	cat %%PREFIX%%/share/gnome/gdesklets/Sensors/%%NAME%%/README
-
-To view the installed applets:
-
-	ls %%PREFIX%%/share/gnome/gdesklets/Displays
-
-To use those applets:
-
-	gdesklets %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/%%NAME%%.display
-
-NOTE: Be sure to login as your user when you use the gdesklets command,
-      as the configuration will be stored in the ~/.gdesklets/ directory
-      and/or gconf database.
-##
diff -urN astro/gdesklets-weather.orig/Makefile astro/gdesklets-weather/Makefile
--- astro/gdesklets-weather.orig/Makefile	Wed Mar 10 12:56:46 2004
+++ astro/gdesklets-weather/Makefile	Wed Mar 10 13:55:02 2004
@@ -27,7 +27,6 @@
 
 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 @@
 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 -urN astro/gdesklets-weather.orig/files/pkg-message.in astro/gdesklets-weather/files/pkg-message.in
--- astro/gdesklets-weather.orig/files/pkg-message.in	Wed Dec 31 18:00:00 1969
+++ astro/gdesklets-weather/files/pkg-message.in	Mon Jan 19 13:04:06 2004
@@ -0,0 +1,22 @@
+##
+To view the README:
+
+	cat %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/README
+	cat %%PREFIX%%/share/gnome/gdesklets/Sensors/%%NAME%%/README
+
+To view the installed applets:
+
+	ls %%PREFIX%%/share/gnome/gdesklets/Displays
+
+To use those applets:
+
+	gdesklets %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/${name}.display
+
+Replace the ${name} with the correct name to what you want to use applets.
+There have some different display files for you to choice which one you want to
+use.
+
+NOTE: Be sure to login as your user when you use the gdesklets command,
+      as the configuration will be stored in the ~/.gdesklets/ directory
+      and/or gconf database.
+##
diff -urN astro/gdesklets-weather.orig/pkg-message astro/gdesklets-weather/pkg-message
--- astro/gdesklets-weather.orig/pkg-message	Mon Jan 19 13:04:06 2004
+++ astro/gdesklets-weather/pkg-message	Wed Dec 31 18:00:00 1969
@@ -1,22 +0,0 @@
-##
-To view the README:
-
-	cat %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/README
-	cat %%PREFIX%%/share/gnome/gdesklets/Sensors/%%NAME%%/README
-
-To view the installed applets:
-
-	ls %%PREFIX%%/share/gnome/gdesklets/Displays
-
-To use those applets:
-
-	gdesklets %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/${name}.display
-
-Replace the ${name} with the correct name to what you want to use applets.
-There have some different display files for you to choice which one you want to
-use.
-
-NOTE: Be sure to login as your user when you use the gdesklets command,
-      as the configuration will be stored in the ~/.gdesklets/ directory
-      and/or gconf database.
-##
--- pkgmessage.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: