git: 10d82819dcc5 - main - net/serveez: Update version 0.2.2=>0.3.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sat, 21 Oct 2023 19:01:45 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=10d82819dcc528ba92c5b25c15de2347f2aac584

commit 10d82819dcc528ba92c5b25c15de2347f2aac584
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-10-21 12:02:15 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-10-21 19:01:36 +0000

    net/serveez: Update version 0.2.2=>0.3.1
    
    - Adopt port
    - Switch to Guile 2
---
 net/serveez/Makefile                               | 19 ++----
 net/serveez/distinfo                               |  5 +-
 net/serveez/files/patch-src_irc-server_Makefile.in | 75 ++++++++++++++++++++++
 ...z__defines.h => patch-src_libserveez_defines.h} |  4 +-
 ...ng-headers.h => patch-src_networking-headers.h} |  2 +-
 5 files changed, 88 insertions(+), 17 deletions(-)

diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 4754be8c03f4..1135bb78b7a7 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -1,36 +1,31 @@
 PORTNAME=	serveez
-PORTVERSION=	0.2.2
-PORTREVISION=	4
+PORTVERSION=	0.3.1
 CATEGORIES=	net devel
 MASTER_SITES=	GNU
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Server framework
 WWW=		https://www.gnu.org/software/serveez/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: guile_global_error
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: guile_global_error
-
-USES=		cpe guile:1.8 tar:xz libtool
+USES=		cpe guile:2.2 libtool pkgconfig tar:lz
 CPE_VENDOR=	gnu
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-libserveez-install
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
 
 MAKE_JOBS_UNSAFE=	yes
+INSTALL_TARGET=	install-strip
 
 INFO=		serveez
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s|test||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e \
-		'/date -r/s|^|#|' ${WRKSRC}/src/irc-server/Makefile.in
-	@${ECHO_CMD} 'static char created[] = "2013-12-02 09:17 UTC";' \
+	@${ECHO_CMD} 'static char created[] = "2021-11-15 13:19 UTC";' \
 		> ${WRKSRC}/src/irc-server/timestamp.c
 
 .include <bsd.port.mk>
diff --git a/net/serveez/distinfo b/net/serveez/distinfo
index af8c436833ff..40727c5e2a46 100644
--- a/net/serveez/distinfo
+++ b/net/serveez/distinfo
@@ -1,2 +1,3 @@
-SHA256 (serveez-0.2.2.tar.xz) = 4c77feabc00b9d68d9c2a7296d076536093feea76d9f47770c475f610e944525
-SIZE (serveez-0.2.2.tar.xz) = 831824
+TIMESTAMP = 1697884594
+SHA256 (serveez-0.3.1.tar.lz) = 9d2a3eb8fd2f773d2e86bf2285bab9c3e1e710a14d841bf71a754c1dc85d087b
+SIZE (serveez-0.3.1.tar.lz) = 861402
diff --git a/net/serveez/files/patch-src_irc-server_Makefile.in b/net/serveez/files/patch-src_irc-server_Makefile.in
new file mode 100644
index 000000000000..d4743b97de5f
--- /dev/null
+++ b/net/serveez/files/patch-src_irc-server_Makefile.in
@@ -0,0 +1,75 @@
+--- src/irc-server/Makefile.in.orig	2023-10-21 11:24:01 UTC
++++ src/irc-server/Makefile.in
+@@ -150,7 +150,7 @@ ARFLAGS = cru
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+ am__v_AR_0 = @echo "  AR      " $@;
+-am__v_AR_1 = 
++am__v_AR_1 =
+ libircserver_a_AR = $(AR) $(ARFLAGS)
+ libircserver_a_LIBADD =
+ am_libircserver_a_OBJECTS = irc-proto.$(OBJEXT) irc-crypt.$(OBJEXT) \
+@@ -167,11 +167,11 @@ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_@AM_V@)
+ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo "  GEN     " $@;
+-am__v_GEN_1 = 
++am__v_GEN_1 =
+ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+-am__v_at_1 = 
++am__v_at_1 =
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
+ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+ am__maybe_remake_depfiles = depfiles
+@@ -187,7 +187,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+-am__v_lt_1 = 
++am__v_lt_1 =
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+@@ -195,7 +195,7 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOO
+ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+ am__v_CC_0 = @echo "  CC      " $@;
+-am__v_CC_1 = 
++am__v_CC_1 =
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -203,7 +203,7 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
+ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo "  CCLD    " $@;
+-am__v_CCLD_1 = 
++am__v_CCLD_1 =
+ SOURCES = $(libircserver_a_SOURCES)
+ DIST_SOURCES = $(libircserver_a_SOURCES)
+ am__can_run_installinfo = \
+@@ -426,7 +426,7 @@ $(am__aclocal_m4_deps):
+ clean-noinstLIBRARIES:
+ 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+ 
+-libircserver.a: $(libircserver_a_OBJECTS) $(libircserver_a_DEPENDENCIES) $(EXTRA_libircserver_a_DEPENDENCIES) 
++libircserver.a: $(libircserver_a_OBJECTS) $(libircserver_a_DEPENDENCIES) $(EXTRA_libircserver_a_DEPENDENCIES)
+ 	$(AM_V_at)-rm -f libircserver.a
+ 	$(AM_V_AR)$(libircserver_a_AR) libircserver.a $(libircserver_a_OBJECTS) $(libircserver_a_LIBADD)
+ 	$(AM_V_at)$(RANLIB) libircserver.a
+@@ -725,13 +725,6 @@ uninstall-am:
+ # GNU date's ‘-r’ flag, which BSD date does not support.
+ 
+ timestamp.c: $(top_builddir)/config.status
+-	if date --version >/dev/null 2>&1 ; then			\
+-	  DATESTR=`date -r $< -u +'%Y-%m-%d %R UTC'` ;			\
+-	else								\
+-	  MDATE=`$(top_builddir)/build-aux/mdate-sh $<` ;		\
+-	  DATESTR=`date -jf "%d %B %Y" "$$MDATE" +'%Y-%m-%d %R UTC'` ;	\
+-	fi ;								\
+-	printf 'static char created[] = "%s";\n' "$$DATESTR" > $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/net/serveez/files/patch-src__libserveez__defines.h b/net/serveez/files/patch-src_libserveez_defines.h
similarity index 63%
rename from net/serveez/files/patch-src__libserveez__defines.h
rename to net/serveez/files/patch-src_libserveez_defines.h
index 21f8e2a77421..26313e3557e3 100644
--- a/net/serveez/files/patch-src__libserveez__defines.h
+++ b/net/serveez/files/patch-src_libserveez_defines.h
@@ -1,5 +1,5 @@
---- src/libserveez/defines.h.orig	2013-01-20 23:49:50.000000000 +0900
-+++ src/libserveez/defines.h	2013-02-25 14:11:54.000000000 +0900
+--- src/libserveez/defines.h.orig	2021-12-11 09:07:37 UTC
++++ src/libserveez/defines.h
 @@ -34,6 +34,14 @@
  #include <winsock2.h>
  #endif
diff --git a/net/serveez/files/patch-src__networking-headers.h b/net/serveez/files/patch-src_networking-headers.h
similarity index 76%
rename from net/serveez/files/patch-src__networking-headers.h
rename to net/serveez/files/patch-src_networking-headers.h
index 2da9d19d7c10..60fe87547f7f 100644
--- a/net/serveez/files/patch-src__networking-headers.h
+++ b/net/serveez/files/patch-src_networking-headers.h
@@ -1,4 +1,4 @@
---- src/networking-headers.h.orig
+--- src/networking-headers.h.orig	2021-12-11 09:07:37 UTC
 +++ src/networking-headers.h
 @@ -25,6 +25,8 @@
   */