Attachment #205987 for bug #239355

View | Details | Raw Unified | Return to bug 239355
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	clixon
PORTVERSION=	4.0.0
PORTREVISION=	1
CATEGORIES=	devel

MAINTAINER=	dcornejo@netgate.com

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-cligen=${LOCALBASE} --sysconfdir=${ETCDIR}

SUB_FILES=	pkg-message

MAKE_JOBS_UNSAFE=yes

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1550886761	1	TIMESTAMP = 1563660130
2	SHA256 (clicon-clixon-3.9.0_GH0.tar.gz) = 3be8eb904a505cc740568e06f75123c6e9b4e0e8173faccdd4a091b1dccfca60	2	SHA256 (clicon-clixon-4.0.0_GH0.tar.gz) = b4f8ffd0e781b2e0097a2ed7bcba65e8fe8e50ae08a35f6867459a3a84a35f39
3	SIZE (clicon-clixon-3.9.0_GH0.tar.gz) = 781568	3	SIZE (clicon-clixon-4.0.0_GH0.tar.gz) = 952149

Lines 1-11 Link Here

(-)files/patch-apps_netconf_netconf__main.c (-11 lines)
1	--- apps/netconf/netconf_main.c.orig 2019-02-21 19:04:04 UTC
2	+++ apps/netconf/netconf_main.c
3	@@ -312,7 +312,7 @@ static int
4	timeout_fn(int s,
5	void *arg)
6	{
7	- clicon_err(OE_EVENTS, ETIME, "User request timeout");
8	+ clicon_err(OE_EVENTS, ETIMEDOUT, "User request timeout");
9	return -1;
10	}
11




--- configure.ac.orig	2019-07-13 14:33:23 UTC
+++ configure.ac
@@ -123,9 +123,6 @@ AC_PROG_LEX
 if test "$LEX" = ":"; then
    AC_MSG_ERROR(CLIXON does not find lex or flex.)
 fi
-if test "$YACC" != "bison -y"; then
-   AC_MSG_ERROR(CLIXON does not find bison.  There are several problems with yacc and byacc. Please install bison.)
-fi
 
 if test "$prefix" = "NONE"; then
      prefix=${ac_default_prefix}

Lines 1-11 Link Here

(-)files/patch-lib_clixon_clixon__plugin.h (-11 lines)
1	--- lib/clixon/clixon_plugin.h.orig 2019-02-21 19:04:04 UTC
2	+++ lib/clixon/clixon_plugin.h
3	@@ -49,8 +49,6 @@
4	/*
5	* Types
6	*/
7	-/* Dynamicically loadable plugin object handle. @see return value of dlopen(3) */
8	-typedef void *plghndl_t;
9
10	/*! Registered RPC callback function
11	* @param[in] h Clicon handle

Line 0 Link Here

(-)files/pkg-message.in (+7 lines)
	1
	2	Version 4.0.0 is much stricter and more standards compliant
	3
	4	It is very likely that you will need to change your code.
	5
	6	See https://github.com/clicon/clixon/blob/master/CHANGELOG.md
	7	for details on the changes, especially the API changes.




bin/clixon_netconf
%%ETCDIR%%/clixonrc
lib/libclixon.so
lib/libclixon.so.4
lib/libclixon.so.4.0
lib/libclixon_backend.so
lib/libclixon_backend.so.4
lib/libclixon_backend.so.4.0
lib/libclixon_cli.so
lib/libclixon_cli.so.4
lib/libclixon_cli.so.4.0
lib/libclixon_netconf.so
lib/libclixon_netconf.so.4
lib/libclixon_netconf.so.4.0
lib/libclixon_restconf.so
lib/libclixon_restconf.so.4
lib/libclixon_restconf.so.4.0
lib/xmldb/text.so
sbin/clixon_backend
sbin/clixon_restconf
%%DATADIR%%/clixon-config@2019-06-05.yang
%%DATADIR%%/clixon-lib@2019-06-05.yang
%%DATADIR%%/clixon-rfc5277@2008-07-01.yang
%%DATADIR%%/clixon-xml-changelog@2019-03-21.yang
%%DATADIR%%/iana-if-type@2014-05-08.yang
%%DATADIR%%/ietf-inet-types@2013-07-15.yang
%%DATADIR%%/ietf-interfaces@2018-02-20.yang

Return to bug 239355

Lines 1-8 Link Here

(-)Makefile (-2 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= clixon	3	PORTNAME= clixon
4	PORTVERSION= 3.9.0	4	PORTVERSION= 4.0.0
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7		6
8	MAINTAINER= dcornejo@netgate.com	7	MAINTAINER= dcornejo@netgate.com
Lines 26-31 Link Here
26	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS= --with-cligen=${LOCALBASE} --sysconfdir=${ETCDIR}	26	CONFIGURE_ARGS= --with-cligen=${LOCALBASE} --sysconfdir=${ETCDIR}
28		27
		28	SUB_FILES= pkg-message
		29
29	MAKE_JOBS_UNSAFE=yes	30	MAKE_JOBS_UNSAFE=yes
30		31
31	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-configure.ac (+12 lines)
	1	--- configure.ac.orig 2019-07-13 14:33:23 UTC
	2	+++ configure.ac
	3	@@ -123,9 +123,6 @@ AC_PROG_LEX
	4	if test "$LEX" = ":"; then
	5	AC_MSG_ERROR(CLIXON does not find lex or flex.)
	6	fi
	7	-if test "$YACC" != "bison -y"; then
	8	- AC_MSG_ERROR(CLIXON does not find bison. There are several problems with yacc and byacc. Please install bison.)
	9	-fi
	10
	11	if test "$prefix" = "NONE"; then
	12	prefix=${ac_default_prefix}

Lines 2-27 Link Here

(-)pkg-plist (-13 / +13 lines)
2	bin/clixon_netconf	2	bin/clixon_netconf
3	%%ETCDIR%%/clixonrc	3	%%ETCDIR%%/clixonrc
4	lib/libclixon.so	4	lib/libclixon.so
5	lib/libclixon.so.3	5	lib/libclixon.so.4
6	lib/libclixon.so.3.9	6	lib/libclixon.so.4.0
7	lib/libclixon_backend.so	7	lib/libclixon_backend.so
8	lib/libclixon_backend.so.3	8	lib/libclixon_backend.so.4
9	lib/libclixon_backend.so.3.9	9	lib/libclixon_backend.so.4.0
10	lib/libclixon_cli.so	10	lib/libclixon_cli.so
11	lib/libclixon_cli.so.3	11	lib/libclixon_cli.so.4
12	lib/libclixon_cli.so.3.9	12	lib/libclixon_cli.so.4.0
13	lib/libclixon_netconf.so	13	lib/libclixon_netconf.so
14	lib/libclixon_netconf.so.3	14	lib/libclixon_netconf.so.4
15	lib/libclixon_netconf.so.3.9	15	lib/libclixon_netconf.so.4.0
16	lib/libclixon_restconf.so	16	lib/libclixon_restconf.so
17	lib/libclixon_restconf.so.3	17	lib/libclixon_restconf.so.4
18	lib/libclixon_restconf.so.3.9	18	lib/libclixon_restconf.so.4.0
19	lib/xmldb/text.so
20	sbin/clixon_backend	19	sbin/clixon_backend
21	sbin/clixon_restconf	20	sbin/clixon_restconf
22	%%DATADIR%%/clixon-config@2019-02-06.yang	21	%%DATADIR%%/clixon-config@2019-06-05.yang
23	%%DATADIR%%/clixon-lib@2019-01-02.yang	22	%%DATADIR%%/clixon-lib@2019-06-05.yang
24	%%DATADIR%%/clixon-rfc5277@2008-07-01.yang	23	%%DATADIR%%/clixon-rfc5277@2008-07-01.yang
		24	%%DATADIR%%/clixon-xml-changelog@2019-03-21.yang
25	%%DATADIR%%/iana-if-type@2014-05-08.yang	25	%%DATADIR%%/iana-if-type@2014-05-08.yang
26	%%DATADIR%%/ietf-inet-types@2013-07-15.yang	26	%%DATADIR%%/ietf-inet-types@2013-07-15.yang
27	%%DATADIR%%/ietf-interfaces@2018-02-20.yang	27	%%DATADIR%%/ietf-interfaces@2018-02-20.yang