ircII-current: Update to reality

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: ircII-current: Update to reality
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Tue, 15 Jan 2019 23:46:54 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Jan 16 00:46:54 2019 +0100
Changeset:	9ac9d574eff8457817b2d9eff5bedc122a6e0e10

Modified Files:
	ircII-current/Makefile
	ircII-current/PLIST
	ircII-current/distinfo
	ircII-current/options.mk
	ircII-current/patches/patch-ac
Added Files:
	ircII-current/patches/patch-include_irc.h

Log Message:
ircII-current: Update to reality

pkgsrc changes:
 - Try to reduce diffs with chat/ircII
 - Avoid to adjust the VERS to current and try to follow upstream VERSION
   instead (similarly to -git packages)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9ac9d574eff8457817b2d9eff5bedc122a6e0e10

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ircII-current/Makefile                    | 18 +++++-------------
 ircII-current/PLIST                       |  8 +++++---
 ircII-current/distinfo                    | 11 ++++++-----
 ircII-current/options.mk                  |  4 ++--
 ircII-current/patches/patch-ac            | 27 +++++----------------------
 ircII-current/patches/patch-include_irc.h | 14 ++++++++++++++
 6 files changed, 37 insertions(+), 45 deletions(-)

diffs:
diff --git a/ircII-current/Makefile b/ircII-current/Makefile
index 049e82298a..2ae8fe4bfa 100644
--- a/ircII-current/Makefile
+++ b/ircII-current/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.74 2015/12/07 06:44:23 mrg Exp $
 
 DISTNAME=		ircii-current
-PKGNAME=		ircII-current
+PKGNAME=		ircII-${VERS}
 CATEGORIES=		chat
 MASTER_SITES=		http://ircii.warped.com/
 EXTRACT_SUFX=		.tar.bz2
@@ -13,6 +13,7 @@ LICENSE=		modified-bsd
 
 CONFLICTS=		blackened-[0-9]*
 
+VERS=		20190115
 PLIST_SUBST+=	VERS=${VERS:Q}
 
 .include "../../mk/bsd.prefs.mk"
@@ -23,25 +24,18 @@ PLIST_SUBST+=	VERS=${VERS:Q}
 # this in pkgsrc, we have to set CONFIGURE_HAS_MANDIR=no so that
 # we don't pass --mandir=${PREFIX}/man as well, last.
 CONFIGURE_HAS_MANDIR=	no
-CONFIGURE_ARGS+=	--mandir=${DESTDIR}${PREFIX}/man
+CONFIGURE_ARGS+=	--mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 WRKSRC=			${WRKDIR}/ircii
 GNU_CONFIGURE=		yes
 .if defined(DEFAULT_IRC_SERVER)
 CONFIGURE_ARGS+=	--with-default-server=${DEFAULT_IRC_SERVER:Q}
 .endif
-USE_TOOLS+=		chmod gawk	# see post-extract
+USE_TOOLS+=		chmod	# see post-extract
 
 # This pkg auto-detects IPv6.
 BUILD_DEFS+=		IPV6_READY
 
-# Change version to current
-SUBST_CLASSES+=		version
-SUBST_STAGE.version=	post-patch
-SUBST_FILES.version=	Makefile
-SUBST_SED.version=	-e 's/VERSION = .*/VERSION = current'
-
-
 .include "options.mk"
 
 # Allow customizations from ${MAKECONF}
@@ -51,9 +45,7 @@ CONFIGURE_ENV+=		${IRCII_CONFIGURE_ENV}
 LDFLAGS.SunOS+=	-lsocket -lnsl
 LDFLAGS+=	${BUILDLINK_LDADD.iconv}
 
-.if ${OPSYS} == "Interix"
-CONFIGURE_ARGS+=	--with-non-blocking=none
-.endif
+CONFIGURE_ARGS.Interix+=	--with-non-blocking=none
 
 # Optionally install compressed help files if MANZ is defined.
 .if defined(MANZ)
diff --git a/ircII-current/PLIST b/ircII-current/PLIST
index cbe187bc94..2578532442 100644
--- a/ircII-current/PLIST
+++ b/ircII-current/PLIST
@@ -1,6 +1,6 @@
 @comment $NetBSD: PLIST,v 1.27 2015/09/17 07:06:48 tron Exp $
 bin/irc
-bin/irc-current
+bin/irc-${VERS}
 bin/ircbug
 bin/ircflush
 libexec/ircio
@@ -131,6 +131,10 @@ share/irc/help/input${GZSUFFIX}
 share/irc/help/intro${GZSUFFIX}
 share/irc/help/invite${GZSUFFIX}
 share/irc/help/ircii/copyright${GZSUFFIX}
+share/irc/help/ircii/command_line_args${GZSUFFIX}
+share/irc/help/ircii/environment_vars${GZSUFFIX}
+share/irc/help/ircii/programming${GZSUFFIX}
+share/irc/help/ircii/server_lists${GZSUFFIX}
 share/irc/help/ison${GZSUFFIX}
 share/irc/help/join${GZSUFFIX}
 share/irc/help/kick${GZSUFFIX}
@@ -290,11 +294,9 @@ share/irc/help/on/send_dcc_chat${GZSUFFIX}
 share/irc/help/on/send_msg${GZSUFFIX}
 share/irc/help/on/send_notice${GZSUFFIX}
 share/irc/help/on/send_public${GZSUFFIX}
-share/irc/help/on/send_talk${GZSUFFIX}
 share/irc/help/on/serial_numbers${GZSUFFIX}
 share/irc/help/on/server_notice${GZSUFFIX}
 share/irc/help/on/signoff${GZSUFFIX}
-share/irc/help/on/talk${GZSUFFIX}
 share/irc/help/on/timer${GZSUFFIX}
 share/irc/help/on/topic${GZSUFFIX}
 share/irc/help/on/wall${GZSUFFIX}
diff --git a/ircII-current/distinfo b/ircII-current/distinfo
index b0574e0c3f..19f5ab43fe 100644
--- a/ircII-current/distinfo
+++ b/ircII-current/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.44 2015/12/07 06:44:23 mrg Exp $
 
-SHA1 (ircii-current.tar.bz2) = 066b7489a03d2bc02cc2b6493346840d7b9642bb
-RMD160 (ircii-current.tar.bz2) = 20926b9a1694066e889ecaae8bd4536b99239863
-SHA512 (ircii-current.tar.bz2) = 3e16bcf170a569cad0b597173a38e29354569715bc51d7b463eeefd2ae6ee4820b74421ed9e2ac34aad46ba41909eeb8137bf34b3c42db89e9b394bab8c2aaf8
-Size (ircii-current.tar.bz2) = 597003 bytes
-SHA1 (patch-ac) = aa5f050c321fe2cf3daa999dc2dbec8591f5b826
+SHA1 (ircii-current.tar.bz2) = 370a03f5f3605c9d55b83251555c098ae61733a1
+RMD160 (ircii-current.tar.bz2) = ad74104fd288f13614d8dee46d323f711884339b
+SHA512 (ircii-current.tar.bz2) = 7d894cbc64cbaee747f04ecab0ed7082a720d5cb567bbe09764825df3a44107f93721cf39f1e5175a16f069657458f7c3077dba8c5351c7026bbe1c1316668e5
+Size (ircii-current.tar.bz2) = 606212 bytes
+SHA1 (patch-ac) = 745353a4776cc9c0a4aa6ce6e2a9422a0864af16
+SHA1 (patch-include_irc.h) = 257e7879461d88d9e8e05205e96cdec702e9e458
diff --git a/ircII-current/options.mk b/ircII-current/options.mk
index fc20990c4c..ed0f1a09aa 100644
--- a/ircII-current/options.mk
+++ b/ircII-current/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.2 2015/09/30 08:25:37 tnn Exp $
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.ircII
-PKG_SUPPORTED_OPTIONS=		# only socks group
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ircII
+PKG_SUPPORTED_OPTIONS=	# only socks group
 PKG_OPTIONS_OPTIONAL_GROUPS=	socks
 PKG_OPTIONS_GROUP.socks=	socks4 dante
 
diff --git a/ircII-current/patches/patch-ac b/ircII-current/patches/patch-ac
index 60fa1ce2ca..c7821d88c0 100644
--- a/ircII-current/patches/patch-ac
+++ b/ircII-current/patches/patch-ac
@@ -1,8 +1,8 @@
 $NetBSD: patch-ac,v 1.8 2014/01/02 07:57:49 mrg Exp $
 
---- Makefile.in.orig	2015-11-12 17:20:02.000000000 +0000
+--- Makefile.in.orig	2019-01-15 11:29:58.000000000 +0000
 +++ Makefile.in
-@@ -128,10 +128,10 @@ LN = @LN@
+@@ -128,8 +128,8 @@ LN = @LN@
  CP = cp
  MV = mv
  SED = sed
@@ -11,31 +11,14 @@ $NetBSD: patch-ac,v 1.8 2014/01/02 07:57:49 mrg Exp $
 +INSTALL = $(BSD_INSTALL_PROGRAM)
 +INSTALL_DATA = $(BSD_INSTALL_DATA)
  
--VERSION = @VERSION@
-+VERSION = current
+ VERSION = @VERSION@
  
- SHELL = /bin/sh
- 
-@@ -150,11 +150,9 @@ installbin: installirc installio install
+@@ -150,7 +150,7 @@ installbin: installirc installio install
  
  installirc: irc installdirs
  	$(INSTALL) irc $(INSTALL_IRC)-$(VERSION)
 -	$(INSTALL) ircbug $(bindir)/ircbug
--	@if test -f $(INSTALL_IRC).old; then $(RM) $(INSTALL_IRC).old; fi
--	@if test -f $(INSTALL_IRC); then $(MV) $(INSTALL_IRC) $(INSTALL_IRC).old; fi
 +	$(BSD_INSTALL_SCRIPT) ircbug $(bindir)/ircbug
  	$(RM) $(INSTALL_IRC)
--	$(LN) $(INSTALL_IRC_NAME)-$(VERSION) $(INSTALL_IRC)
-+	cd ${bindir}; $(LN) irc-$(VERSION) irc
- 
- installscript: installdirs
- 	(								\
-@@ -194,7 +192,7 @@ installman:
- #	$(INSTALL_DATA) $(topdir)/doc/query-pr.1 $(mandir)
- 
- installdirs:
--	umask 022; $(topdir)/mkinstalldirs $(IRCLIB) $(bindir) $(mandir) \
-+	$(topdir)/mkinstalldirs $(IRCLIB) $(bindir) $(mandir) \
- 		$(INSTALL_SCRIPT) $(HELP_DIR) $(libexecdir)
+ 	$(LN) $(INSTALL_IRC_NAME)-$(VERSION) $(INSTALL_IRC)
  
- clena clean:
diff --git a/ircII-current/patches/patch-include_irc.h b/ircII-current/patches/patch-include_irc.h
new file mode 100644
index 0000000000..d6b43c55bc
--- /dev/null
+++ b/ircII-current/patches/patch-include_irc.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-include_irc.h,v 1.1 2017/07/22 15:13:41 maya Exp $
+
+limits.h for PATH_MAX
+
+--- include/irc.h.orig	2017-07-03 12:44:25.000000000 +0000
++++ include/irc.h
+@@ -92,6 +92,7 @@
+ # include <fcntl.h>
+ #endif /* HAVE_FCNTL_H */
+ 
++#include <limits.h>
+ #include <unistd.h>
+ 
+ #ifdef HAVE_SYS_FILE_H
Prev by Date: bwm-ng: remove, net/bwm-ng is newer
Next by Date: ircII-current: Remove not needed patch
Previous by Thread: bwm-ng: remove, net/bwm-ng is newer
Next by Thread: ircII-current: Remove not needed patch
Indexes:
Home | Main Index | Thread Index | Old Index