[pkgsrc/trunk]: pkgsrc/x11/xfce4-notifyd Don't rewrite pkgsrc file but rather...

[youri <youri%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe9d685f94ce
branches:  trunk
changeset: 308692:fe9d685f94ce
user:      youri <youri%pkgsrc.org@localhost>
date:      Tue May 29 21:24:20 2018 +0000

description:
Don't rewrite pkgsrc file but rather do substitution in wrksrc.

diffstat:

 x11/xfce4-notifyd/Makefile                    |  22 ++++++++++++----------
 x11/xfce4-notifyd/files/xfce4-notifyd.desktop |   2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diffs (50 lines):

diff -r 853a2849dd25 -r fe9d685f94ce x11/xfce4-notifyd/Makefile
--- a/x11/xfce4-notifyd/Makefile        Tue May 29 16:51:39 2018 +0000
+++ b/x11/xfce4-notifyd/Makefile        Tue May 29 21:24:20 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/05/29 14:21:58 youri Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/29 21:24:20 youri Exp $
 #
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -12,19 +12,21 @@
 
 TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-
 DESKTOP_FILE=  xfce4-notifyd.desktop
 
-CONF_FILES+=   ${FILESDIR}/${DESKTOP_FILE}                      \
-               ${PKG_SYSCONFDIR}/xdg/autostart/${DESKTOP_FILE}
-
 SUBST_CLASSES=         prefix
 SUBST_MESSAGE.prefix=  Fixing path
-SUBST_STAGE.prefix=    post-install
-SUBST_FILES.prefix=    ${FILESDIR}/${DESKTOP_FILE}
-SUBST_SED.prefix=      -e 's,@PREFIX@,${PREFIX},'
+SUBST_STAGE.prefix=    pre-install
+SUBST_FILES.prefix=    xfce4-notifyd/${DESKTOP_FILE}
+SUBST_VARS.prefix=     PREFIX
+
+pre-configure:
+       cp ${FILESDIR}/${DESKTOP_FILE} \
+           ${WRKSRC}/xfce4-notifyd/${DESKTOP_FILE}
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/xfce4-notifyd/${DESKTOP_FILE} \
+           ${PKG_SYSCONFDIR}/xdg/autostart/${DESKTOP_FILE}
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libxfce4ui/buildlink3.mk"
diff -r 853a2849dd25 -r fe9d685f94ce x11/xfce4-notifyd/files/xfce4-notifyd.desktop
--- a/x11/xfce4-notifyd/files/xfce4-notifyd.desktop     Tue May 29 16:51:39 2018 +0000
+++ b/x11/xfce4-notifyd/files/xfce4-notifyd.desktop     Tue May 29 21:24:20 2018 +0000
@@ -3,5 +3,5 @@
 Name=Notification Daemon
 Comment=Launch notification daemon
 Icon=preferences-system-notifications
-Exec=/usr/pkg/lib/xfce4/notifyd/xfce4-notifyd
+Exec=@PREFIX@/lib/xfce4/notifyd/xfce4-notifyd
 OnlyShowIn=XFCE;