From 77c311d02274b6818e29306c83a3b533b6df01c5 Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Sun, 2 May 2004 13:10:50 +0000 Subject: Process the pkg-message template earlier than post-install so package users will actually get to see it the right way. PR: ports/66123 Reported by: obrien --- x11/kde4-baseapps/Makefile | 10 +++++++--- x11/kde4-baseapps/files/pkg-message | 11 +++++++++++ x11/kde4-baseapps/pkg-message | 11 ----------- x11/kde4-runtime/Makefile | 10 +++++++--- x11/kde4-runtime/files/pkg-message | 11 +++++++++++ x11/kde4-runtime/pkg-message | 11 ----------- x11/kde4-workspace/Makefile | 10 +++++++--- x11/kde4-workspace/files/pkg-message | 11 +++++++++++ x11/kde4-workspace/pkg-message | 11 ----------- x11/kdebase3/Makefile | 10 +++++++--- x11/kdebase3/files/pkg-message | 11 +++++++++++ x11/kdebase3/pkg-message | 11 ----------- x11/kdebase4-runtime/Makefile | 10 +++++++--- x11/kdebase4-runtime/files/pkg-message | 11 +++++++++++ x11/kdebase4-runtime/pkg-message | 11 ----------- x11/kdebase4-workspace/Makefile | 10 +++++++--- x11/kdebase4-workspace/files/pkg-message | 11 +++++++++++ x11/kdebase4-workspace/pkg-message | 11 ----------- x11/kdebase4/Makefile | 10 +++++++--- x11/kdebase4/files/pkg-message | 11 +++++++++++ x11/kdebase4/pkg-message | 11 ----------- 21 files changed, 126 insertions(+), 98 deletions(-) create mode 100644 x11/kde4-baseapps/files/pkg-message delete mode 100644 x11/kde4-baseapps/pkg-message create mode 100644 x11/kde4-runtime/files/pkg-message delete mode 100644 x11/kde4-runtime/pkg-message create mode 100644 x11/kde4-workspace/files/pkg-message delete mode 100644 x11/kde4-workspace/pkg-message create mode 100644 x11/kdebase3/files/pkg-message delete mode 100644 x11/kdebase3/pkg-message create mode 100644 x11/kdebase4-runtime/files/pkg-message delete mode 100644 x11/kdebase4-runtime/pkg-message create mode 100644 x11/kdebase4-workspace/files/pkg-message delete mode 100644 x11/kdebase4-workspace/pkg-message create mode 100644 x11/kdebase4/files/pkg-message delete mode 100644 x11/kdebase4/pkg-message diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 4d2f8252ffa1..5e7be64d5308 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes +PKGMESSAGE= ${WRKDIR}/MESSAGE GNU_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -65,14 +66,17 @@ post-configure: ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile +post-build: + @${CAT} ${FILESDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} + post-install: ${LOCALBASE}/bin/genkdmconf --no-old --in ${PREFIX}/share/config/kdm/default ${LOCALBASE}/bin/genkdmconf --no-backup --no-old-scripts --in ${PREFIX}/share/config/kdm ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ - ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' + ${CHMOD} g+s ${PREFIX}/bin/ksysguard$d + ${CAT} ${PKGMESSAGE} .include diff --git a/x11/kde4-baseapps/files/pkg-message b/x11/kde4-baseapps/files/pkg-message new file mode 100644 index 000000000000..f97e3656f98b --- /dev/null +++ b/x11/kde4-baseapps/files/pkg-message @@ -0,0 +1,11 @@ +This port has installed fonts into %%PREFIX%%/share/fonts + +You'll have to add %%PREFIX%%/share/fonts +to your X font path by either: + +$ xset fp+ %%PREFIX%%/share/fonts +$ xset fp rehash + +or by adding it to your X-server configuration file (usually +/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and +restarting the X-server. diff --git a/x11/kde4-baseapps/pkg-message b/x11/kde4-baseapps/pkg-message deleted file mode 100644 index f97e3656f98b..000000000000 --- a/x11/kde4-baseapps/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -This port has installed fonts into %%PREFIX%%/share/fonts - -You'll have to add %%PREFIX%%/share/fonts -to your X font path by either: - -$ xset fp+ %%PREFIX%%/share/fonts -$ xset fp rehash - -or by adding it to your X-server configuration file (usually -/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and -restarting the X-server. diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 4d2f8252ffa1..5e7be64d5308 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes +PKGMESSAGE= ${WRKDIR}/MESSAGE GNU_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -65,14 +66,17 @@ post-configure: ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile +post-build: + @${CAT} ${FILESDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} + post-install: ${LOCALBASE}/bin/genkdmconf --no-old --in ${PREFIX}/share/config/kdm/default ${LOCALBASE}/bin/genkdmconf --no-backup --no-old-scripts --in ${PREFIX}/share/config/kdm ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ - ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' + ${CHMOD} g+s ${PREFIX}/bin/ksysguard$d + ${CAT} ${PKGMESSAGE} .include diff --git a/x11/kde4-runtime/files/pkg-message b/x11/kde4-runtime/files/pkg-message new file mode 100644 index 000000000000..f97e3656f98b --- /dev/null +++ b/x11/kde4-runtime/files/pkg-message @@ -0,0 +1,11 @@ +This port has installed fonts into %%PREFIX%%/share/fonts + +You'll have to add %%PREFIX%%/share/fonts +to your X font path by either: + +$ xset fp+ %%PREFIX%%/share/fonts +$ xset fp rehash + +or by adding it to your X-server configuration file (usually +/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and +restarting the X-server. diff --git a/x11/kde4-runtime/pkg-message b/x11/kde4-runtime/pkg-message deleted file mode 100644 index f97e3656f98b..000000000000 --- a/x11/kde4-runtime/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -This port has installed fonts into %%PREFIX%%/share/fonts - -You'll have to add %%PREFIX%%/share/fonts -to your X font path by either: - -$ xset fp+ %%PREFIX%%/share/fonts -$ xset fp rehash - -or by adding it to your X-server configuration file (usually -/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and -restarting the X-server. diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 4d2f8252ffa1..5e7be64d5308 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes +PKGMESSAGE= ${WRKDIR}/MESSAGE GNU_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -65,14 +66,17 @@ post-configure: ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile +post-build: + @${CAT} ${FILESDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} + post-install: ${LOCALBASE}/bin/genkdmconf --no-old --in ${PREFIX}/share/config/kdm/default ${LOCALBASE}/bin/genkdmconf --no-backup --no-old-scripts --in ${PREFIX}/share/config/kdm ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ - ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' + ${CHMOD} g+s ${PREFIX}/bin/ksysguard$d + ${CAT} ${PKGMESSAGE} .include diff --git a/x11/kde4-workspace/files/pkg-message b/x11/kde4-workspace/files/pkg-message new file mode 100644 index 000000000000..f97e3656f98b --- /dev/null +++ b/x11/kde4-workspace/files/pkg-message @@ -0,0 +1,11 @@ +This port has installed fonts into %%PREFIX%%/share/fonts + +You'll have to add %%PREFIX%%/share/fonts +to your X font path by either: + +$ xset fp+ %%PREFIX%%/share/fonts +$ xset fp rehash + +or by adding it to your X-server configuration file (usually +/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and +restarting the X-server. diff --git a/x11/kde4-workspace/pkg-message b/x11/kde4-workspace/pkg-message deleted file mode 100644 index f97e3656f98b..000000000000 --- a/x11/kde4-workspace/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -This port has installed fonts into %%PREFIX%%/share/fonts - -You'll have to add %%PREFIX%%/share/fonts -to your X font path by either: - -$ xset fp+ %%PREFIX%%/share/fonts -$ xset fp rehash - -or by adding it to your X-server configuration file (usually -/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and -restarting the X-server. diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 4d2f8252ffa1..5e7be64d5308 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes +PKGMESSAGE= ${WRKDIR}/MESSAGE GNU_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -65,14 +66,17 @@ post-configure: ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile +post-build: + @${CAT} ${FILESDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} + post-install: ${LOCALBASE}/bin/genkdmconf --no-old --in ${PREFIX}/share/config/kdm/default ${LOCALBASE}/bin/genkdmconf --no-backup --no-old-scripts --in ${PREFIX}/share/config/kdm ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ - ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' + ${CHMOD} g+s ${PREFIX}/bin/ksysguard$d + ${CAT} ${PKGMESSAGE} .include diff --git a/x11/kdebase3/files/pkg-message b/x11/kdebase3/files/pkg-message new file mode 100644 index 000000000000..f97e3656f98b --- /dev/null +++ b/x11/kdebase3/files/pkg-message @@ -0,0 +1,11 @@ +This port has installed fonts into %%PREFIX%%/share/fonts + +You'll have to add %%PREFIX%%/share/fonts +to your X font path by either: + +$ xset fp+ %%PREFIX%%/share/fonts +$ xset fp rehash + +or by adding it to your X-server configuration file (usually +/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and +restarting the X-server. diff --git a/x11/kdebase3/pkg-message b/x11/kdebase3/pkg-message deleted file mode 100644 index f97e3656f98b..000000000000 --- a/x11/kdebase3/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -This port has installed fonts into %%PREFIX%%/share/fonts - -You'll have to add %%PREFIX%%/share/fonts -to your X font path by either: - -$ xset fp+ %%PREFIX%%/share/fonts -$ xset fp rehash - -or by adding it to your X-server configuration file (usually -/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and -restarting the X-server. diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 4d2f8252ffa1..5e7be64d5308 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes +PKGMESSAGE= ${WRKDIR}/MESSAGE GNU_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -65,14 +66,17 @@ post-configure: ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile +post-build: + @${CAT} ${FILESDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} + post-install: ${LOCALBASE}/bin/genkdmconf --no-old --in ${PREFIX}/share/config/kdm/default ${LOCALBASE}/bin/genkdmconf --no-backup --no-old-scripts --in ${PREFIX}/share/config/kdm ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ - ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' + ${CHMOD} g+s ${PREFIX}/bin/ksysguard$d + ${CAT} ${PKGMESSAGE} .include diff --git a/x11/kdebase4-runtime/files/pkg-message b/x11/kdebase4-runtime/files/pkg-message new file mode 100644 index 000000000000..f97e3656f98b --- /dev/null +++ b/x11/kdebase4-runtime/files/pkg-message @@ -0,0 +1,11 @@ +This port has installed fonts into %%PREFIX%%/share/fonts + +You'll have to add %%PREFIX%%/share/fonts +to your X font path by either: + +$ xset fp+ %%PREFIX%%/share/fonts +$ xset fp rehash + +or by adding it to your X-server configuration file (usually +/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and +restarting the X-server. diff --git a/x11/kdebase4-runtime/pkg-message b/x11/kdebase4-runtime/pkg-message deleted file mode 100644 index f97e3656f98b..000000000000 --- a/x11/kdebase4-runtime/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -This port has installed fonts into %%PREFIX%%/share/fonts - -You'll have to add %%PREFIX%%/share/fonts -to your X font path by either: - -$ xset fp+ %%PREFIX%%/share/fonts -$ xset fp rehash - -or by adding it to your X-server configuration file (usually -/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and -restarting the X-server. diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 4d2f8252ffa1..5e7be64d5308 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes +PKGMESSAGE= ${WRKDIR}/MESSAGE GNU_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -65,14 +66,17 @@ post-configure: ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile +post-build: + @${CAT} ${FILESDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} + post-install: ${LOCALBASE}/bin/genkdmconf --no-old --in ${PREFIX}/share/config/kdm/default ${LOCALBASE}/bin/genkdmconf --no-backup --no-old-scripts --in ${PREFIX}/share/config/kdm ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ - ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' + ${CHMOD} g+s ${PREFIX}/bin/ksysguard$d + ${CAT} ${PKGMESSAGE} .include diff --git a/x11/kdebase4-workspace/files/pkg-message b/x11/kdebase4-workspace/files/pkg-message new file mode 100644 index 000000000000..f97e3656f98b --- /dev/null +++ b/x11/kdebase4-workspace/files/pkg-message @@ -0,0 +1,11 @@ +This port has installed fonts into %%PREFIX%%/share/fonts + +You'll have to add %%PREFIX%%/share/fonts +to your X font path by either: + +$ xset fp+ %%PREFIX%%/share/fonts +$ xset fp rehash + +or by adding it to your X-server configuration file (usually +/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and +restarting the X-server. diff --git a/x11/kdebase4-workspace/pkg-message b/x11/kdebase4-workspace/pkg-message deleted file mode 100644 index f97e3656f98b..000000000000 --- a/x11/kdebase4-workspace/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -This port has installed fonts into %%PREFIX%%/share/fonts - -You'll have to add %%PREFIX%%/share/fonts -to your X font path by either: - -$ xset fp+ %%PREFIX%%/share/fonts -$ xset fp rehash - -or by adding it to your X-server configuration file (usually -/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and -restarting the X-server. diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 4d2f8252ffa1..5e7be64d5308 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes +PKGMESSAGE= ${WRKDIR}/MESSAGE GNU_CONFIGURE= yes INSTALLS_SHLIB= yes @@ -65,14 +66,17 @@ post-configure: ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile +post-build: + @${CAT} ${FILESDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} + post-install: ${LOCALBASE}/bin/genkdmconf --no-old --in ${PREFIX}/share/config/kdm/default ${LOCALBASE}/bin/genkdmconf --no-backup --no-old-scripts --in ${PREFIX}/share/config/kdm ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ - ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' + ${CHMOD} g+s ${PREFIX}/bin/ksysguard$d + ${CAT} ${PKGMESSAGE} .include diff --git a/x11/kdebase4/files/pkg-message b/x11/kdebase4/files/pkg-message new file mode 100644 index 000000000000..f97e3656f98b --- /dev/null +++ b/x11/kdebase4/files/pkg-message @@ -0,0 +1,11 @@ +This port has installed fonts into %%PREFIX%%/share/fonts + +You'll have to add %%PREFIX%%/share/fonts +to your X font path by either: + +$ xset fp+ %%PREFIX%%/share/fonts +$ xset fp rehash + +or by adding it to your X-server configuration file (usually +/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and +restarting the X-server. diff --git a/x11/kdebase4/pkg-message b/x11/kdebase4/pkg-message deleted file mode 100644 index f97e3656f98b..000000000000 --- a/x11/kdebase4/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -This port has installed fonts into %%PREFIX%%/share/fonts - -You'll have to add %%PREFIX%%/share/fonts -to your X font path by either: - -$ xset fp+ %%PREFIX%%/share/fonts -$ xset fp rehash - -or by adding it to your X-server configuration file (usually -/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and -restarting the X-server. -- cgit v1.2.3