From 26e53285fc438e8b7ac9b64dd411453698f58303 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov <amdmi3@FreeBSD.org> Date: Fri, 9 May 2014 18:51:14 +0000 Subject: - Convert USE_BZIP2 to USES - Don't remove mtree directories - Whitespace nits --- math/labplot/Makefile | 7 +++---- math/labplot/pkg-plist | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/math/labplot/Makefile b/math/labplot/Makefile index d3355fe1c4a4..929a747cc057 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -21,8 +21,7 @@ NETCDF_DESC= NetCDF data support WRKSRC= ${WRKDIR}/beta2 -USE_BZIP2= yes -USES= cmake shared-mime-info +USES= tar:bzip2 cmake shared-mime-info USE_XORG= xft xpm USE_GCC= yes USE_KDE4= automoc4 kdelibs kdeprefix @@ -33,7 +32,7 @@ INSTALLS_ICONS= yes CDF_LIB_DEPENDS= libcdf.so:${PORTSDIR}/science/cdf CDF_CMAKE_OFF= -DCDF_LIBRARY:STRING="" -HDF5_LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 +HDF5_LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 HDF5_CMAKE_OFF= -DHDF5_LIBRARY:STRING="" NETCDF_LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf @@ -47,6 +46,6 @@ post-patch: ${WRKSRC}/src/backend/core/AbstractAspect.h @${REINPLACE_CMD} -e \ 's|!isnan|!std::isnan|' \ - ${WRKSRC}/src/backend/worksheet/plots/cartesian/CartesianCoordinateSystem.cpp + ${WRKSRC}/src/backend/worksheet/plots/cartesian/CartesianCoordinateSystem.cpp .include <bsd.port.mk> diff --git a/math/labplot/pkg-plist b/math/labplot/pkg-plist index d5da7840f9a9..6cd8b4d20c5a 100644 --- a/math/labplot/pkg-plist +++ b/math/labplot/pkg-plist @@ -55,6 +55,3 @@ share/mime/packages/lml.desktop @dirrmtry share/apps/LabPlot2 @dirrmtry share/apps @dirrmtry share/applications/kde4 -@dirrmtry share/applications -@dirrmtry share -@dirrmtry bin -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0