CVS commit: pkgsrc/x11/xfce4-notifyd

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Tue May 29 21:24:20 UTC 2018

Modified Files:
        pkgsrc/x11/xfce4-notifyd: Makefile
        pkgsrc/x11/xfce4-notifyd/files: xfce4-notifyd.desktop

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


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xfce4-notifyd/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xfce4-notifyd/files/xfce4-notifyd.desktop

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xfce4-notifyd/Makefile
diff -u pkgsrc/x11/xfce4-notifyd/Makefile:1.12 pkgsrc/x11/xfce4-notifyd/Makefile:1.13
--- pkgsrc/x11/xfce4-notifyd/Makefile:1.12      Tue May 29 14:21:58 2018
+++ pkgsrc/x11/xfce4-notifyd/Makefile   Tue May 29 21:24:20 2018
@@ -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 @@ COMMENT=    XFCE Notify daemon
 
 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"

Index: pkgsrc/x11/xfce4-notifyd/files/xfce4-notifyd.desktop
diff -u pkgsrc/x11/xfce4-notifyd/files/xfce4-notifyd.desktop:1.1 pkgsrc/x11/xfce4-notifyd/files/xfce4-notifyd.desktop:1.2
--- pkgsrc/x11/xfce4-notifyd/files/xfce4-notifyd.desktop:1.1    Tue May 29 14:21:58 2018
+++ pkgsrc/x11/xfce4-notifyd/files/xfce4-notifyd.desktop        Tue May 29 21:24:20 2018
@@ -3,5 +3,5 @@ Type=Application
 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;