svn commit: r371436 - head/x11-fm/ultracopier

[John Marino]

Author: marino
Date: Fri Oct 24 13:01:32 2014
New Revision: 371436
URL: https://svnweb.freebsd.org/changeset/ports/371436
QAT: https://qat.redports.org/buildarchive/r371436/

Log:
  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.

Deleted:
  head/x11-fm/ultracopier/pkg-plist
Modified:
  head/x11-fm/ultracopier/Makefile

Modified: head/x11-fm/ultracopier/Makefile
==============================================================================
--- head/x11-fm/ultracopier/Makefile	Fri Oct 24 12:18:33 2014	(r371435)
+++ head/x11-fm/ultracopier/Makefile	Fri Oct 24 13:01:32 2014	(r371436)
@@ -21,13 +21,15 @@ USE_QT4=	corelib dbus gui moc_build netw
 USES=		cmake desktop-file-utils tar:bzip2
 CMAKE_ARGS+=	-DCMAKE_BUILD_KDE4:bool=true
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+UDDATABASE=	${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true
 
-PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR_WITHOUT_PREFIX:Q} \
-		ICONS_DIR=${ICONS_DIR:Q}
-
-DESKTOPDIR_WITHOUT_PREFIX=	${DESKTOPDIR:S,^${PREFIX}/,,}
-ICONS_DIR=	share/icons/hicolor
-
+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>