From owner-svn-ports-all@freebsd.org Sun Mar 18 15:11:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D20C1F5B519; Sun, 18 Mar 2018 15:11:09 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8850975948; Sun, 18 Mar 2018 15:11:09 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6ADD922059; Sun, 18 Mar 2018 15:11:09 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2IFB9Vj020231; Sun, 18 Mar 2018 15:11:09 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2IFB9NE020229; Sun, 18 Mar 2018 15:11:09 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201803181511.w2IFB9NE020229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Sun, 18 Mar 2018 15:11:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464921 - in head/net/sshping: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in head/net/sshping: . files X-SVN-Commit-Revision: 464921 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2018 15:11:10 -0000 Author: ehaupt Date: Sun Mar 18 15:11:09 2018 New Revision: 464921 URL: https://svnweb.freebsd.org/changeset/ports/464921 Log: - Use cmake and get rid of own do-build/do-install target - Adjust package list according to cmake's man category preference - Sort USES - Adjust manpage section during build - Bump PORTREVISION due to package list change Added: head/net/sshping/files/ head/net/sshping/files/patch-CMakeLists.txt (contents, props changed) Modified: head/net/sshping/Makefile Modified: head/net/sshping/Makefile ============================================================================== --- head/net/sshping/Makefile Sun Mar 18 15:08:18 2018 (r464920) +++ head/net/sshping/Makefile Sun Mar 18 15:11:09 2018 (r464921) @@ -4,6 +4,7 @@ PORTNAME= sshping PORTVERSION= 0.1.3 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net MAINTAINER= ehaupt@FreeBSD.org @@ -14,24 +15,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libssh.so:security/libssh -USES= localbase:ldflags perl5 +USES= cmake localbase:ldflags perl5 USE_GITHUB= yes USE_PERL5= build GH_ACCOUNT= spook -LDFLAGS+= -lssh - -PLIST_FILES= bin/sshping man/man1/sshping.1.gz - -do-build: - ${CXX} ${CXXFLAGS} ${LDFLAGS} -I ${WRKSRC}/ext \ - ${WRKSRC}/src/sshping.cxx -o ${WRKSRC}/bin/sshping - @pod2man ${WRKSRC}/doc/${PORTNAME}.pod ${WRKSRC}/doc/${PORTNAME}.1 - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1 +PLIST_FILES= bin/sshping man/man8/sshping.8.gz .include Added: head/net/sshping/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/sshping/files/patch-CMakeLists.txt Sun Mar 18 15:11:09 2018 (r464921) @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2018-03-15 21:50:52 UTC ++++ CMakeLists.txt +@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.8) + #find_package(libssh) + + # Build the sshping binary +-set(CMAKE_CXX_FLAGS "-I ../ext/ -Wall") ++set(CMAKE_CXX_FLAGS "-I ${CMAKE_CURRENT_SOURCE_DIR}/ext/ -Wall") + add_executable(${PROJECT_NAME} src/sshping.cxx) + target_link_libraries(${PROJECT_NAME} ssh) + install(TARGETS ${PROJECT_NAME} DESTINATION bin CONFIGURATIONS Release) +@@ -16,7 +16,7 @@ if (P2M) + message(STATUS "pod2man found, use the 'man' target to build") + endif (P2M) + set(DOC_DIR ${CMAKE_SOURCE_DIR}/doc) +-set(P2M_OPTS -c "ssh-based ping test utility" -d 2018-03-13 -r v0.1.3) ++set(P2M_OPTS --section=8 -c "ssh-based ping test utility" -d 2018-03-13 -r v0.1.3) + set(MAN_SRC ${DOC_DIR}/sshping.pod) + set(MAN_TGT ${DOC_DIR}/sshping.8) + add_custom_command(