diff --git a/graphics/airsaned/Makefile b/graphics/airsaned/Makefile index 0806d824d9aa..b5b93f4df58c 100644 --- a/graphics/airsaned/Makefile +++ b/graphics/airsaned/Makefile @@ -1,32 +1,35 @@ PORTNAME= airsaned DISTVERSIONPREFIX= v -DISTVERSION= 0.3.2-50 -DISTVERSIONSUFFIX= -gdeab313 +DISTVERSION= 0.3.2-54 +DISTVERSIONSUFFIX= -g53909a5 CATEGORIES= graphics MAINTAINER= fbsd@opal.com COMMENT= Apple AirScan compatible SANE web frontend LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libavahi-client.so:net/avahi-app \ libpng.so:graphics/png \ libsane.so:graphics/sane-backends USES= cmake compiler:c++11-lib jpeg localbase:ldflags USE_GITHUB= yes -USE_RC_SUBR= ${PORTNAME} GH_ACCOUNT= SimulPiscator GH_PROJECT= AirSane +USE_RC_SUBR= ${PORTNAME} + post-patch: + @${REINPLACE_CMD} -e 's|%%STAGEDIR%%|${STAGEDIR}|g' \ + ${PATCH_WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${PATCH_WRKSRC}/server/server.cpp + ${PATCH_WRKSRC}/server/mainserver.cpp post-install: @${MV} ${STAGEDIR}${PREFIX}/etc/airsane/ignore.conf ${STAGEDIR}${PREFIX}/etc/airsane/ignore.conf.sample @${MV} ${STAGEDIR}${PREFIX}/etc/airsane/options.conf ${STAGEDIR}${PREFIX}/etc/airsane/options.conf.sample .include diff --git a/graphics/airsaned/distinfo b/graphics/airsaned/distinfo index ff969aa19d17..6e327c6195e6 100644 --- a/graphics/airsaned/distinfo +++ b/graphics/airsaned/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633432825 -SHA256 (SimulPiscator-AirSane-v0.3.2-50-gdeab313_GH0.tar.gz) = a9df4ed9de8f59f07fe9d491bf9eb96c8168001ba0025b96bf97c39ac49e35e9 -SIZE (SimulPiscator-AirSane-v0.3.2-50-gdeab313_GH0.tar.gz) = 115706 +TIMESTAMP = 1641754683 +SHA256 (SimulPiscator-AirSane-v0.3.2-54-g53909a5_GH0.tar.gz) = 64b4b81bb65b0a69dead944a063b0bf4276d8772749b24c4c7fa87134c819e80 +SIZE (SimulPiscator-AirSane-v0.3.2-54-g53909a5_GH0.tar.gz) = 114019 diff --git a/graphics/airsaned/files/patch-CMakeLists.txt b/graphics/airsaned/files/patch-CMakeLists.txt index 34f75f731952..72fce98f6e20 100644 --- a/graphics/airsaned/files/patch-CMakeLists.txt +++ b/graphics/airsaned/files/patch-CMakeLists.txt @@ -1,71 +1,57 @@ ---- CMakeLists.txt.orig 2021-09-18 16:22:32 UTC +--- CMakeLists.txt.orig 2021-02-01 18:41:51 UTC +++ CMakeLists.txt -@@ -20,6 +20,7 @@ endif() - - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) -+include(GNUInstallDirs) - - include_directories(.) - if(APPLE) -@@ -66,6 +67,13 @@ add_executable(${PROJECT_NAME} +@@ -67,6 +67,13 @@ add_executable(${PROJECT_NAME} zeroconf/hotplugnotifier.cpp ${ZEROCONF_FILES} ) + -+if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) ++if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + set(USB_LIBRARY usb) +else() + set(USB_LIBRARY usb-1.0) +endif() + target_link_libraries( ${PROJECT_NAME} Threads::Threads -@@ -73,7 +81,7 @@ target_link_libraries( +@@ -74,7 +79,7 @@ target_link_libraries( jpeg png ${ZEROCONF_LIBS} - usb-1.0 + ${USB_LIBRARY} ) if(APPLE) -@@ -105,8 +113,10 @@ install(CODE " - else() +@@ -102,8 +107,31 @@ install(CODE " + endif() + ") - install(TARGETS ${PROJECT_NAME} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${BINDIR} - ) -+ -+if(CMAKE_SYSTEM_NAME STREQUAL Linux) - install(FILES systemd/airsaned.service - DESTINATION /lib/systemd/system - ) -@@ -114,21 +124,9 @@ install(FILES systemd/airsaned.default - DESTINATION /etc/default - RENAME airsane - ) -+endif() ++elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") --install(CODE " -- if(NOT EXISTS /etc/airsane/ignore.conf) -- file(INSTALL ${CMAKE_SOURCE_DIR}/etc/ignore.conf DESTINATION /etc/airsane) -- endif() --") --install(CODE " -- if(NOT EXISTS /etc/airsane/options.conf) -- file(INSTALL ${CMAKE_SOURCE_DIR}/etc/options.conf DESTINATION /etc/airsane) -- endif() --") --install(CODE " -- if(NOT EXISTS /etc/airsane/Gnome-scanner.png) -- file(INSTALL ${CMAKE_SOURCE_DIR}/etc/Gnome-scanner.png DESTINATION /etc/airsane) -- endif() --") -- -+install(FILES etc/ignore.conf etc/options.conf etc/Gnome-scanner.png -+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/airsane ++set(STAGEDIR "%%STAGEDIR%%") ++ ++install(TARGETS ${PROJECT_NAME} ++ RUNTIME DESTINATION sbin +) - endif() ++ ++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 diff --git a/graphics/airsaned/files/patch-imageformats-pngencoder.cpp b/graphics/airsaned/files/patch-imageformats-pngencoder.cpp index cb604abf0c26..14d8e66c4d75 100644 --- a/graphics/airsaned/files/patch-imageformats-pngencoder.cpp +++ b/graphics/airsaned/files/patch-imageformats-pngencoder.cpp @@ -1,20 +1,20 @@ ---- imageformats/pngencoder.cpp.orig 2021-10-05 12:35:03 UTC +--- imageformats/pngencoder.cpp.orig 2021-02-01 18:41:51 UTC +++ imageformats/pngencoder.cpp @@ -17,11 +17,17 @@ along with this program. If not, see +#else - #include + #include +#endif #include #include #if __APPLE__ #include +#elif __FreeBSD__ +#include #else #include #endif diff --git a/graphics/airsaned/files/patch-server-server.cpp b/graphics/airsaned/files/patch-server-mainserver.cpp similarity index 65% rename from graphics/airsaned/files/patch-server-server.cpp rename to graphics/airsaned/files/patch-server-mainserver.cpp index e54242f6f2b1..5eb30b1a912f 100644 --- a/graphics/airsaned/files/patch-server-server.cpp +++ b/graphics/airsaned/files/patch-server-mainserver.cpp @@ -1,16 +1,16 @@ ---- server/server.cpp.orig 2021-10-05 17:07:11 UTC -+++ server/server.cpp -@@ -103,11 +103,11 @@ Server::Server(int argc, char** argv) +--- server/mainserver.cpp.orig 2021-02-01 18:41:51 UTC ++++ server/mainserver.cpp +@@ -83,11 +83,11 @@ MainServer::MainServer(int argc, char** argv) "ignore SANE network scanners", localonly }, { "options-file", - "/etc/airsane/options.conf", + "%%PREFIX%%/etc/airsane/options.conf", "location of device options file", optionsfile }, { "ignore-list", - "/etc/airsane/ignore.conf", + "%%PREFIX%%/etc/airsane/ignore.conf", "location of device ignore list", ignorelist }, - { "debug", "false", "log debug information to stderr", debug }, + { "random-uuids", diff --git a/graphics/airsaned/files/patch-web-httpserver.cpp b/graphics/airsaned/files/patch-web-httpserver.cpp index 0f120845e0d7..cae26d5639a5 100644 --- a/graphics/airsaned/files/patch-web-httpserver.cpp +++ b/graphics/airsaned/files/patch-web-httpserver.cpp @@ -1,12 +1,12 @@ ---- web/httpserver.cpp.orig 2021-10-05 12:35:03 UTC +--- web/httpserver.cpp.orig 2021-02-01 18:41:51 UTC +++ web/httpserver.cpp -@@ -25,6 +25,9 @@ along with this program. If not, see #include +#ifdef __FreeBSD__ +#include +#endif #include #include #include diff --git a/graphics/airsaned/pkg-plist b/graphics/airsaned/pkg-plist index beed33b17baa..6d01b36085bb 100644 --- a/graphics/airsaned/pkg-plist +++ b/graphics/airsaned/pkg-plist @@ -1,4 +1,4 @@ -bin/airsaned +sbin/airsaned etc/airsane/Gnome-scanner.png @sample etc/airsane/ignore.conf.sample @sample etc/airsane/options.conf.sample