git: 9a7c9aad1d57 - main - irc/simpleirc: Update to 1.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Wed, 08 Mar 2023 10:19:32 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9a7c9aad1d57fd84c403c2e643bff9a8a098b545

commit 9a7c9aad1d57fd84c403c2e643bff9a8a098b545
Author:     Clockwork6400 <Clockwork6400@protonmail.com>
AuthorDate: 2023-03-05 08:29:02 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-03-08 10:10:17 +0000

    irc/simpleirc: Update to 1.3
    
    Changelog: https://git.suckless.org/sic/log.html
    
    PR:             269944
---
 irc/simpleirc/Makefile              | 13 ++++----
 irc/simpleirc/distinfo              |  5 ++--
 irc/simpleirc/files/patch-Makefile  | 59 ++++++++++++++++++++++++-------------
 irc/simpleirc/files/patch-config.mk | 26 ----------------
 4 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/irc/simpleirc/Makefile b/irc/simpleirc/Makefile
index b33f761e8897..3cbe5e677628 100644
--- a/irc/simpleirc/Makefile
+++ b/irc/simpleirc/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	simpleirc
-PORTVERSION=	1.2
+DISTVERSION=	1.3
 CATEGORIES=	irc
-MASTER_SITES=	http://dl.suckless.org/tools/ \
-		LOCAL/dhn
-DISTNAME=	sic-${PORTVERSION}
+MASTER_SITES=	http://dl.suckless.org/tools/
 
-MAINTAINER=	ports@FreeBSD.org
+DISTNAME=	sic-${DISTVERSION}
+
+MAINTAINER=	Clockwork6400@protonmail.com
 COMMENT=	Extremely simple IRC client
 WWW=		http://www.suckless.org/programs/sic.html
 
@@ -17,6 +17,9 @@ PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/simpleirc
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
diff --git a/irc/simpleirc/distinfo b/irc/simpleirc/distinfo
index 0c4115f77635..213aded0785d 100644
--- a/irc/simpleirc/distinfo
+++ b/irc/simpleirc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (sic-1.2.tar.gz) = ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185
-SIZE (sic-1.2.tar.gz) = 4563
+TIMESTAMP = 1677860610
+SHA256 (sic-1.3.tar.gz) = 30478fab3ebc75f2eb5d08cbb5b2fedcaf489116e75a2dd7197e3e9c733d65d2
+SIZE (sic-1.3.tar.gz) = 5740
diff --git a/irc/simpleirc/files/patch-Makefile b/irc/simpleirc/files/patch-Makefile
index fe1f52d1e903..3971b2b4b8f7 100644
--- a/irc/simpleirc/files/patch-Makefile
+++ b/irc/simpleirc/files/patch-Makefile
@@ -1,26 +1,43 @@
---- Makefile.orig	2013-06-16 06:03:32 UTC
+--- Makefile.orig	2022-10-04 17:34:08 UTC
 +++ Makefile
-@@ -38,17 +38,18 @@ dist: clean
+@@ -4,13 +4,13 @@ NAME = sic
+ VERSION = 1.3
+ 
+ # paths
+-PREFIX = /usr/local
+-MANPREFIX = ${PREFIX}/share/man
++PREFIX ?= /usr/local
++MANPREFIX = ${PREFIX}/man
+ 
+ # use system flags.
+-SIC_CFLAGS = ${CFLAGS}
+-SIC_LDFLAGS = ${LDFLAGS}
+-SIC_CPPFLAGS = ${LDFLAGS} -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
++SIC_CFLAGS += ${CFLAGS}
++SIC_LDFLAGS += ${LDFLAGS}
++SIC_CPPFLAGS += ${LDFLAGS} -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
+ 
+ BIN = sic
+ SRC = ${BIN:=.c}
+@@ -45,15 +45,15 @@ dist:
+ 
  install: all
- 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
- 	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f sic ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/sic
-+	@cp -f sic ${DESTDIR}${PREFIX}/bin/simpleirc
-+	@chmod 755 ${DESTDIR}${PREFIX}/bin/simpleirc
- 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
- 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
- 	@sed "s/VERSION/${VERSION}/g" < sic.1 > ${DESTDIR}${MANPREFIX}/man1/sic.1
--	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/sic.1
-+	@mv ${DESTDIR}${MANPREFIX}/man1/sic.1 ${DESTDIR}${MANPREFIX}/man1/simpleirc.1
-+	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/simpleirc.1
+ 	mkdir -p ${DESTDIR}${PREFIX}/bin
+-	cp -f ${BIN} "${DESTDIR}${PREFIX}/bin"
+-	chmod 755 "${DESTDIR}${PREFIX}/bin/${BIN}"
++	cp -f sic ${DESTDIR}${PREFIX}/bin/simpleirc
++	chmod 755 ${DESTDIR}${PREFIX}/bin/simpleirc
+ 	mkdir -p "${DESTDIR}${MANPREFIX}/man1"
+ 	sed "s/VERSION/${VERSION}/g" < ${MAN1} > "${DESTDIR}${MANPREFIX}/man1/${MAN1}"
+-	chmod 644 "${DESTDIR}${MANPREFIX}/man1/${MAN1}"
++	mv ${DESTDIR}${MANPREFIX}/man1/sic.1 ${DESTDIR}${MANPREFIX}/man1/simpleirc.1
++	chmod 644 ${DESTDIR}${MANPREFIX}/man1/simpleirc.1
  
  uninstall:
- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
--	@rm -f ${DESTDIR}${PREFIX}/bin/sic
-+	@rm -f ${DESTDIR}${PREFIX}/bin/simpleirc
- 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
--	@rm -f ${DESTDIR}${MANPREFIX}/man1/sic.1
-+	@rm -f ${DESTDIR}${MANPREFIX}/man1/simpleirc.1
+-	rm -f \
+-		"${DESTDIR}${PREFIX}/bin/${BIN}"\
+-		"${DESTDIR}${MANPREFIX}/man1/${MAN1}"
++	rm -f ${DESTDIR}${PREFIX}/bin/simpleirc
++	rm -f ${DESTDIR}${MANPREFIX}/man1/simpleirc.1
  
- .PHONY: all options clean dist install uninstall
+ .PHONY: all clean dist install uninstall
diff --git a/irc/simpleirc/files/patch-config.mk b/irc/simpleirc/files/patch-config.mk
deleted file mode 100644
index c880b9540b6e..000000000000
--- a/irc/simpleirc/files/patch-config.mk
+++ /dev/null
@@ -1,26 +0,0 @@
---- config.mk.orig	2013-06-16 06:03:32 UTC
-+++ config.mk
-@@ -4,17 +4,17 @@ VERSION = 1.2
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+PREFIX ?= /usr/local
-+MANPREFIX = ${PREFIX}/man
- 
- # includes and libs
- INCS = -I. -I/usr/include
- LIBS = -L/usr/lib -lc
- 
- # flags
--CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
--LDFLAGS = -s ${LIBS}
-+CPPFLAGS += -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
-+CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-+LDFLAGS += -s ${LIBS}
- 
- # compiler and linker
--CC = cc
-+CC ?= cc