summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrakuco <rakuco@FreeBSD.org>2014-12-31 16:59:20 +0000
committerrakuco <rakuco@FreeBSD.org>2014-12-31 16:59:20 +0000
commit8ccbbf76c29de6b3d0f02350579fc3b41aa50871 (patch)
tree88e34f275063eca670ceaa272b9b26ccb091e00c
parent9e04d4093222e32a86394b4d6b18887328db6cdf (diff)
downloadFreeBSD-ports-8ccbbf76c29de6b3d0f02350579fc3b41aa50871.zip
FreeBSD-ports-8ccbbf76c29de6b3d0f02350579fc3b41aa50871.tar.gz
Stop installing an empty headers directory.
A fix has been submitted to https://github.com/FreeRDP/Remmina/pull/428. While a proper decision is not made there, just patch the code to stop calling INSTALL(DIRECTORY ...) with a path that does not exist. Until CMake 3.1.0, this would end up creating an empty directory (hence the @dir entry in the plist). The behavior has changed in 3.1.0, and we were getting build errors because we were referring to a directory that did not exist in the plist.
-rw-r--r--net/remmina/Makefile2
-rw-r--r--net/remmina/files/patch-FreeRDP-Remmina-b6a55ae4
-rw-r--r--net/remmina/pkg-plist1
3 files changed, 3 insertions, 4 deletions
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index 487986c..f13b0d6 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -3,7 +3,7 @@
PORTNAME= remmina
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net gnome
MAINTAINER= fluffy@FreeBSD.org
diff --git a/net/remmina/files/patch-FreeRDP-Remmina-b6a55ae b/net/remmina/files/patch-FreeRDP-Remmina-b6a55ae
index 6d18955..428ee41 100644
--- a/net/remmina/files/patch-FreeRDP-Remmina-b6a55ae
+++ b/net/remmina/files/patch-FreeRDP-Remmina-b6a55ae
@@ -44,7 +44,7 @@ diff -urN CMakeLists.txt CMakeLists.txt
if(NOT BUILD_SHARED_LIBS)
set(BUILD_SHARED_LIBS ON)
endif()
-@@ -77,34 +71,35 @@
+@@ -77,34 +71,34 @@
include_directories(.)
include_directories(remmina/include)
@@ -91,7 +91,7 @@ diff -urN CMakeLists.txt CMakeLists.txt
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
- install(DIRECTORY include/remmina DESTINATION include/remmina FILES_MATCHING PATTERN "*.h")
+-install(DIRECTORY include/remmina DESTINATION include/remmina FILES_MATCHING PATTERN "*.h")
diff -urN COPYING COPYING
--- COPYING 1970-01-01 10:00:00.000000000 +1000
+++ COPYING 2014-01-08 02:31:52.000000000 +1100
diff --git a/net/remmina/pkg-plist b/net/remmina/pkg-plist
index 286b428..c3cc95f 100644
--- a/net/remmina/pkg-plist
+++ b/net/remmina/pkg-plist
@@ -44,4 +44,3 @@ share/icons/hicolor/scalable/apps/remmina.svg
%%NLS%%share/locale/tr/LC_MESSAGES/remmina.mo
%%NLS%%share/locale/uk/LC_MESSAGES/remmina.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina.mo
-@dir include/remmina
OpenPOWER on IntegriCloud