1 files changed, 40 insertions, 49 deletions
diff --git a/graphics/airsaned/files/patch-CMakeLists.txt b/graphics/airsaned/files/patch-CMakeLists.txt
index 72fce98f6e20..f9d9f430c839 100644
--- a/graphics/airsaned/files/patch-CMakeLists.txt
+++ b/graphics/airsaned/files/patch-CMakeLists.txt
@@ -1,57 +1,48 @@
---- CMakeLists.txt.orig	2021-02-01 18:41:51 UTC
+--- CMakeLists.txt.orig	2021-10-19 16:15:25 UTC
 +++ CMakeLists.txt
-@@ -67,6 +67,13 @@ add_executable(${PROJECT_NAME}
-     zeroconf/hotplugnotifier.cpp
-     ${ZEROCONF_FILES}
- )
-+
-+if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-+  set(USB_LIBRARY usb)
+@@ -113,7 +113,6 @@ install(CODE "
+     endif()
+ ")
+ 
+-
+ elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+ 
+ if ($ENV{PREFIX})
+@@ -122,27 +121,33 @@ else()
+     # default is "/usr/local"
+ endif()
+ 
++if ($ENV{STAGEDIR})
++    set(CMAKE_INSTALL_STAGEDIR $ENV{STAGEDIR})
 +else()
-+  set(USB_LIBRARY usb-1.0)
++    set(CMAKE_INSTALL_STAGEDIR "../stage")
 +endif()
 +
- target_link_libraries(
-     ${PROJECT_NAME}
-     Threads::Threads
-@@ -74,7 +79,7 @@ target_link_libraries(
-     jpeg
-     png
-     ${ZEROCONF_LIBS}
--    usb-1.0
-+    ${USB_LIBRARY}
+ install(TARGETS ${PROJECT_NAME}
+     RUNTIME DESTINATION sbin
  )
  
- if(APPLE)
-@@ -102,8 +107,31 @@ install(CODE "
+ install(CODE "
+-    if(NOT EXISTS ${CMAKE_INSTALL_PREFIX}/etc/airsane/ignore.conf)
++    if(NOT EXISTS ${CMAKE_INSTALL_STAGEDIR}/${CMAKE_INSTALL_PREFIX}/etc/airsane/ignore.conf)
+         file(INSTALL ${CMAKE_SOURCE_DIR}/etc/ignore.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/airsane)
+     endif()
+ ")
+ install(CODE "
+-    if(NOT EXISTS ${CMAKE_INSTALL_PREFIX}/etc/airsane/options.conf)
++    if(NOT EXISTS ${CMAKE_INSTALL_STAGEDIR}/${CMAKE_INSTALL_PREFIX}/etc/airsane/options.conf)
+         file(INSTALL ${CMAKE_SOURCE_DIR}/etc/options.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/airsane)
+     endif()
+ ")
+ install(CODE "
+-    if(NOT EXISTS ${CMAKE_INSTALL_PREFIX}/etc/airsane/Gnome-scanner.png)
++    if(NOT EXISTS ${CMAKE_INSTALL_STAGEDIR}/${CMAKE_INSTALL_PREFIX}/etc/airsane/Gnome-scanner.png)
+         file(INSTALL ${CMAKE_SOURCE_DIR}/etc/Gnome-scanner.png DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/airsane)
+     endif()
+ ")
+ install(CODE "
+-    if(NOT EXISTS ${CMAKE_INSTALL_PREFIX}/etc/rc.d/airsaned)
++    if(NOT EXISTS ${CMAKE_INSTALL_STAGEDIR}/${CMAKE_INSTALL_PREFIX}/etc/rc.d/airsaned)
+         file(INSTALL ${CMAKE_SOURCE_DIR}/freebsd/airsaned DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/rc.d)
      endif()
  ")
- 
-+elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
- 
-+set(STAGEDIR "%%STAGEDIR%%")
-+
-+install(TARGETS ${PROJECT_NAME}
-+    RUNTIME DESTINATION sbin
-+)
-+
-+install(CODE "
-+    if(NOT EXISTS ${STAGEDIR}/usr/local/etc/airsane/ignore.conf)
-+        file(INSTALL ${CMAKE_SOURCE_DIR}/etc/ignore.conf DESTINATION /usr/local/etc/airsane)
-+    endif()
-+")
-+install(CODE "
-+    if(NOT EXISTS ${STAGEDIR}/usr/local/etc/airsane/options.conf)
-+        file(INSTALL ${CMAKE_SOURCE_DIR}/etc/options.conf DESTINATION /usr/local/etc/airsane)
-+    endif()
-+")
-+install(CODE "
-+    if(NOT EXISTS ${STAGEDIR}/usr/local/etc/airsane/Gnome-scanner.png)
-+        file(INSTALL ${CMAKE_SOURCE_DIR}/etc/Gnome-scanner.png DESTINATION /usr/local/etc/airsane)
-+    endif()
-+")
-+
- else()
- 
- install(TARGETS ${PROJECT_NAME}
-     RUNTIME DESTINATION bin