diff options
| author | marino <marino@FreeBSD.org> | 2014-10-24 21:01:32 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2014-10-24 21:01:32 +0800 |
| commit | 081e89a381cbfea35480af73baf28a3a6b610a44 (patch) | |
| tree | 00309229146c2e21c24f46079eeb01abd1f99b20 | |
| parent | 8f097779615a9ea3d7d260b8b6db08fc04d44bc9 (diff) | |
| download | freebsd-ports-gnome-081e89a381cbfea35480af73baf28a3a6b610a44.tar.gz freebsd-ports-gnome-081e89a381cbfea35480af73baf28a3a6b610a44.tar.zst freebsd-ports-gnome-081e89a381cbfea35480af73baf28a3a6b610a44.zip | |
x11-fm/ultracopier: Remove pkg-plist, unmask installation commands
With the new ability to use full paths, the plist can be simplified.
This fixes a build issue on DragonFly where the PLIST_SUB was using
an unevaluated variable (actually containing things like curly
brackets), and this fix was preferable to := evaluations.
| -rw-r--r-- | x11-fm/ultracopier/Makefile | 20 | ||||
| -rw-r--r-- | x11-fm/ultracopier/pkg-plist | 6 |
2 files changed, 11 insertions, 15 deletions
diff --git a/x11-fm/ultracopier/Makefile b/x11-fm/ultracopier/Makefile index 4e4c8ac69026..11d3eaf43c83 100644 --- a/x11-fm/ultracopier/Makefile +++ b/x11-fm/ultracopier/Makefile @@ -21,13 +21,15 @@ USE_QT4= corelib dbus gui moc_build network qmake_build rcc_build svg \ USES= cmake desktop-file-utils tar:bzip2 CMAKE_ARGS+= -DCMAKE_BUILD_KDE4:bool=true WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -PLIST_SUB= DESKTOPDIR=${DESKTOPDIR_WITHOUT_PREFIX:Q} \ - ICONS_DIR=${ICONS_DIR:Q} - -DESKTOPDIR_WITHOUT_PREFIX= ${DESKTOPDIR:S,^${PREFIX}/,,} -ICONS_DIR= share/icons/hicolor - +UDDATABASE= ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true + +PLIST_FILES= ${DESKTOPDIR:Q}/ultracopier.desktop \ + bin/ultracopier \ + share/icons/hicolor/16x16/apps/ultracopier.png \ + share/icons/hicolor/128x128/apps/ultracopier.png \ + "@exec ${UDDATABASE}" \ + "@unexec ${UDDATABASE}" + post-patch: @${REINPLACE_CMD} -E \ -e 's|0\.2\.0\.15|0.2.0.16|; \ @@ -38,12 +40,12 @@ post-install: # install icons .for dimensions in 16x16 128x128 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${dimensions}/apps - @${INSTALL_DATA} ${WRKSRC}/src/other/ultracopier-${dimensions}.png \ + ${INSTALL_DATA} ${WRKSRC}/src/other/ultracopier-${dimensions}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${dimensions}/apps/ultracopier.png .endfor # install desktop file @${MKDIR} ${STAGEDIR}${DESKTOPDIR} - @${INSTALL_DATA} ${WRKSRC}/src/other/ultracopier.desktop \ + ${INSTALL_DATA} ${WRKSRC}/src/other/ultracopier.desktop \ ${STAGEDIR}${DESKTOPDIR} .include <bsd.port.mk> diff --git a/x11-fm/ultracopier/pkg-plist b/x11-fm/ultracopier/pkg-plist deleted file mode 100644 index dd3b26921822..000000000000 --- a/x11-fm/ultracopier/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/ultracopier -%%DESKTOPDIR%%/ultracopier.desktop -%%ICONS_DIR%%/16x16/apps/ultracopier.png -%%ICONS_DIR%%/128x128/apps/ultracopier.png -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true |