Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Jul 2023 22:36:34 GMT
From:      Rodrigo Osorio <rodrigo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 0ee1d83007d6 - main - sysutils/sispmctl: Fix port issues
Message-ID:  <202307292236.36TMaY6v087954@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by rodrigo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0ee1d83007d6510b1103323df3c34eee405ba9be

commit 0ee1d83007d6510b1103323df3c34eee405ba9be
Author:     Rodrigo Osorio <rodrigo@FreeBSD.org>
AuthorDate: 2023-07-29 21:42:41 +0000
Commit:     Rodrigo Osorio <rodrigo@FreeBSD.org>
CommitDate: 2023-07-29 22:23:11 +0000

    sysutils/sispmctl: Fix port issues
    
     * Disable sispmctl webserver capabilities
     * Don't install static library from configure
     * Fix COMMENT
     * Use DISTVERSION instead of PORTVERSION
     * Use PLIST_FILES instead of pkg-plist
    
    Reported by:    diizzy
---
 sysutils/sispmctl/Makefile                        | 17 ++++----
 sysutils/sispmctl/files/patch-src_web1_index.html | 11 -----
 sysutils/sispmctl/files/patch-src_web2_index.html | 11 -----
 sysutils/sispmctl/files/patch-src_web3_index.html | 11 -----
 sysutils/sispmctl/pkg-plist                       | 49 -----------------------
 5 files changed, 10 insertions(+), 89 deletions(-)

diff --git a/sysutils/sispmctl/Makefile b/sysutils/sispmctl/Makefile
index 1106b548fbc5..ad66edcdf9ed 100644
--- a/sysutils/sispmctl/Makefile
+++ b/sysutils/sispmctl/Makefile
@@ -1,24 +1,27 @@
 PORTNAME=	sispmctl
-PORTVERSION=	4.11
+DISTVERSION=	4.11
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rodrigo@FreeBSD.org
-COMMENT=	SIS-PM Control for Linux
+COMMENT=	CLI tool to manage USB controlled powerstrips produced by GEMBIRD LTD
 WWW=		https://sispmctl.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf dos2unix libtool pkgconfig
-DOS2UNIX_FILES=	src/web2/index.html src/web3/index.html
+USES=	libtool pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	-disable-static --disable-webless
 CONFIGURE_ENV=	LIBUSB_CFLAGS="-I/usr/include" \
-		LIBUSB_LIBS="-L/usr/lib -lusb"
+				LIBUSB_LIBS="-L/usr/lib -lusb"
 
-post-install:
-	${LN} -s httpd/skin2 ${STAGEDIR}${PREFIX}/share/doc/sispmctl/skin
+PLIST_FILES=	bin/sispmctl \
+				lib/libsispmctl.so \
+				lib/libsispmctl.so.0 \
+				lib/libsispmctl.so.0.2.2 \
+				man/man1/sispmctl.1.gz
 
 .include <bsd.port.mk>
diff --git a/sysutils/sispmctl/files/patch-src_web1_index.html b/sysutils/sispmctl/files/patch-src_web1_index.html
deleted file mode 100644
index 5384d39495eb..000000000000
--- a/sysutils/sispmctl/files/patch-src_web1_index.html
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/web1/index.html.orig	2022-04-02 11:21:46 UTC
-+++ src/web1/index.html
-@@ -17,7 +17,7 @@
-                 <DIV STYLE="height: 70px;">&nbsp;</DIV>
-                 <DIV ALIGN="center">
-                 <TABLE WIDTH="60%" CELLSPACING=0>
--                  <TR><TH COLSPAN=3><H1>SiS PM Control for Linux $$version()$$</H1></TH><TH WIDTH="100">
-+                  <TR><TH COLSPAN=3><H1>SiS PM Control for FreeBSD $$version()$$</H1></TH><TH WIDTH="100">
-                     <IMG SRC="logo.png" ALT="sispm_http logo"></TH></TR>
-                   <TR><TD COLSPAN=4>&nbsp;</TD></TR>
-                   <TR><TD>&nbsp;</TD>
diff --git a/sysutils/sispmctl/files/patch-src_web2_index.html b/sysutils/sispmctl/files/patch-src_web2_index.html
deleted file mode 100644
index d7a13f7e048a..000000000000
--- a/sysutils/sispmctl/files/patch-src_web2_index.html
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/web2/index.html.orig	2022-04-02 11:21:46 UTC
-+++ src/web2/index.html
-@@ -8,7 +8,7 @@
- <!DOCTYPE html>
- <html lang="en">
- <head>
--<title>SiS PM Control for Linux $$version()$$</title>
-+<title>SiS PM Control for FreeBSD $$version()$$</title>
- <link rel="stylesheet" type="text/css" href="style.css">
- <meta charset="UTF-8">
- </head>
diff --git a/sysutils/sispmctl/files/patch-src_web3_index.html b/sysutils/sispmctl/files/patch-src_web3_index.html
deleted file mode 100644
index bed574347a5e..000000000000
--- a/sysutils/sispmctl/files/patch-src_web3_index.html
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/web3/index.html.orig	2022-04-02 11:21:46 UTC
-+++ src/web3/index.html
-@@ -8,7 +8,7 @@
- <!DOCTYPE html>
- <html lang="en">
- <head>
--<title>SiS PM Control for Linux $$version()$$</title>
-+<title>SiS PM Control for FreeBSD $$version()$$</title>
- <link rel="stylesheet" type="text/css" href="style.css">
- <meta charset="UTF-8">
- </head>
diff --git a/sysutils/sispmctl/pkg-plist b/sysutils/sispmctl/pkg-plist
deleted file mode 100644
index a6cd0bf49b68..000000000000
--- a/sysutils/sispmctl/pkg-plist
+++ /dev/null
@@ -1,49 +0,0 @@
-bin/sispmctl
-lib/libsispmctl.a
-lib/libsispmctl.so
-lib/libsispmctl.so.0
-lib/libsispmctl.so.0.2.2
-man/man1/sispmctl.1.gz
-share/doc/sispmctl/COPYING
-share/doc/sispmctl/README.md
-share/doc/sispmctl/artwork/sispmctl.png
-share/doc/sispmctl/artwork/sispmctl.svg
-share/doc/sispmctl/examples/60-sispmctl.rules
-share/doc/sispmctl/examples/passwordsetup.sh
-share/doc/sispmctl/examples/sispmctl.service
-share/doc/sispmctl/httpd/skin1/index.html
-share/doc/sispmctl/httpd/skin1/logo.png
-share/doc/sispmctl/httpd/skin1/off1.html
-share/doc/sispmctl/httpd/skin1/off2.html
-share/doc/sispmctl/httpd/skin1/off3.html
-share/doc/sispmctl/httpd/skin1/off4.html
-share/doc/sispmctl/httpd/skin1/on1.html
-share/doc/sispmctl/httpd/skin1/on2.html
-share/doc/sispmctl/httpd/skin1/on3.html
-share/doc/sispmctl/httpd/skin1/on4.html
-share/doc/sispmctl/httpd/skin1/status0.png
-share/doc/sispmctl/httpd/skin1/status1.png
-share/doc/sispmctl/httpd/skin1/style.css
-share/doc/sispmctl/httpd/skin2/index.html
-share/doc/sispmctl/httpd/skin2/logo.svg
-share/doc/sispmctl/httpd/skin2/off1.html
-share/doc/sispmctl/httpd/skin2/off2.html
-share/doc/sispmctl/httpd/skin2/off3.html
-share/doc/sispmctl/httpd/skin2/off4.html
-share/doc/sispmctl/httpd/skin2/on1.html
-share/doc/sispmctl/httpd/skin2/on2.html
-share/doc/sispmctl/httpd/skin2/on3.html
-share/doc/sispmctl/httpd/skin2/on4.html
-share/doc/sispmctl/httpd/skin2/style.css
-share/doc/sispmctl/httpd/skin3/index.html
-share/doc/sispmctl/httpd/skin3/logo.svg
-share/doc/sispmctl/httpd/skin3/off1.html
-share/doc/sispmctl/httpd/skin3/off2.html
-share/doc/sispmctl/httpd/skin3/off3.html
-share/doc/sispmctl/httpd/skin3/off4.html
-share/doc/sispmctl/httpd/skin3/on1.html
-share/doc/sispmctl/httpd/skin3/on2.html
-share/doc/sispmctl/httpd/skin3/on3.html
-share/doc/sispmctl/httpd/skin3/on4.html
-share/doc/sispmctl/httpd/skin3/style.css
-share/doc/sispmctl/skin



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307292236.36TMaY6v087954>