sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-04 12:26:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 3.5.0

Browse source
This commit is contained in:
Dmitry Marakasov 2019-07-01 16:14:06 +00:00
parent 18e2ef236c
commit 21f992bcc7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=505612
4 changed files with 13 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devel/fossology-nomos-standalone/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= fossology PORTNAME= fossology
PORTVERSION= 3.4.0 PORTVERSION= 3.5.0
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
PKGNAMESUFFIX= -nomos-standalone PKGNAMESUFFIX= -nomos-standalone
@ -14,6 +13,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= gawk:lang/gawk BUILD_DEPENDS= gawk:lang/gawk
LIB_DEPENDS= libjson-c.so:devel/json-c
USE_GITHUB= yes USE_GITHUB= yes

6
devel/fossology-nomos-standalone/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1543848059 TIMESTAMP = 1557247478
SHA256 (fossology-fossology-3.4.0_GH0.tar.gz) = 5a984e9a464f00c8455ba27a04f503b269e9f8e4e0d859b8000ecf31aa2078e9 SHA256 (fossology-fossology-3.5.0_GH0.tar.gz) = 6eb0a9c0dca22ad1603af481d63d51afa791161b7f16391e485dba6b02bc7676
SIZE (fossology-fossology-3.4.0_GH0.tar.gz) = 19826517 SIZE (fossology-fossology-3.5.0_GH0.tar.gz) = 19953162

26
devel/fossology-nomos-standalone/files/patch-src_nomos_agent_Makefile.sa
View file

@ -1,4 +1,4 @@
--- src/nomos/agent/Makefile.sa.orig 2017-04-21 13:29:41 UTC --- src/nomos/agent/Makefile.sa.orig 2019-04-12 08:47:43 UTC
+++ src/nomos/agent/Makefile.sa +++ src/nomos/agent/Makefile.sa
@@ -2,10 +2,6 @@ @@ -2,10 +2,6 @@
# This is to make a version of nomos that does not require any of the fossology build dependencies. # This is to make a version of nomos that does not require any of the fossology build dependencies.
@ -11,26 +11,16 @@
EXE = nomossa EXE = nomossa
SPEC = STRINGS.in SPEC = STRINGS.in
@@ -19,33 +15,34 @@ GENOBJS = _precheck.o _autodata.o @@ -28,26 +24,26 @@ all: encode $(EXE)
HDRS = nomos.h $(OBJS:.o=.h) _autodefs.h
#CFLAGS_LOCAL = -DSTANDALONE -g -O2 -Wall -D_FILE_OFFSET_BITS=64
-CFLAGS_LOCAL = -DSTANDALONE -Wall -D_FILE_OFFSET_BITS=64 `pkg-config glib-2.0 --cflags --libs`
+CFLAGS_LOCAL = -DSTANDALONE -Wall -D_FILE_OFFSET_BITS=64 `pkg-config glib-2.0 --cflags`
+LDFLAGS_LOCAL = `pkg-config glib-2.0 --libs`
-all: encode $(EXE)
+all: encode $(EXE)
debug: nomos-gl debug: nomos-gl
$(EXE): nomos.o $(OBJS) $(GENOBJS) $(EXE): nomos.o $(OBJS) $(GENOBJS)
- $(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS_LOCAL) -o $(EXE) - $(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS_LOCAL) $(FO_LDFLAGS) -o $(EXE)
+ $(CC) nomos.o $(OBJS) $(GENOBJS) $(LDFLAGS) $(LDFLAGS_LOCAL) -o $(EXE) + $(CC) nomos.o $(OBJS) $(GENOBJS) $(LDFLAGS) $(FO_LDFLAGS) -o $(EXE)
-nomos.o: nomos.c $(HDRS) $(DB) $(REPO) $(AGENTLIB) $(VARS) -nomos.o: nomos.c $(HDRS) $(DB) $(REPO) $(AGENTLIB) $(VARS)
- $(CC) -c $< $(CFLAGS_LOCAL) $(DEFS) - $(CC) -c $< $(CFLAGS_LOCAL) $(DEFS)
+nomos.o: nomos.c $(HDRS) $(REPO) $(AGENTLIB) $(VARS) +nomos.o: nomos.c $(HDRS) $(REPO) $(AGENTLIB)
+ $(CC) -c $< $(CFLAGS) $(CFLAGS_LOCAL) + $(CC) -c $< $(CFLAGS) $(CFLAGS_LOCAL)
nomos-gl: nomos-g.o $(OBJS) $(GENOBJS) nomos-gl: nomos-g.o $(OBJS) $(GENOBJS)
@ -39,7 +29,7 @@
-nomos-g.o: nomos.c $(HDRS) $(DB) $(REPO) $(AGENTLIB) $(VARS) -nomos-g.o: nomos.c $(HDRS) $(DB) $(REPO) $(AGENTLIB) $(VARS)
- $(CC) -c -l /usr/lib/libefence.a $< $(CFLAGS_LOCAL) - $(CC) -c -l /usr/lib/libefence.a $< $(CFLAGS_LOCAL)
+nomos-g.o: nomos.c $(HDRS) $(REPO) $(AGENTLIB) $(VARS) +nomos-g.o: nomos.c $(HDRS) $(REPO) $(AGENTLIB)
+ $(CC) -c -l /usr/lib/libefence.a $< $(CFLAGS) $(CFLAGS_LOCAL) + $(CC) -c -l /usr/lib/libefence.a $< $(CFLAGS) $(CFLAGS_LOCAL)
-$(OBJS) $(GENOBJS): %.o: %.c $(HDRS) $(DB) $(VARS) -$(OBJS) $(GENOBJS): %.o: %.c $(HDRS) $(DB) $(VARS)
@ -57,7 +47,7 @@
_precheck.c: _autodata.c $(PRE) $(CHECK) _precheck.c: _autodata.c $(PRE) $(CHECK)
# @echo "NOTE: _autodata.c has changed --> regenerate _precheck.c" # @echo "NOTE: _autodata.c has changed --> regenerate _precheck.c"
@@ -53,7 +50,7 @@ _precheck.c: _autodata.c $(PRE) $(CHECK) @@ -55,7 +51,7 @@ _precheck.c: _autodata.c $(PRE) $(CHECK)
./$(CHECK) ./$(CHECK)
# @$(MAKE) $(STRINGS) $(KEYS) # @$(MAKE) $(STRINGS) $(KEYS)
@ -66,7 +56,7 @@
@echo "NOTE: GENSEARCHDATA takes 1-2 minutes to run" @echo "NOTE: GENSEARCHDATA takes 1-2 minutes to run"
./$(LICFIX) ./$(LICFIX)
@@ -82,5 +79,3 @@ clean: @@ -84,5 +80,3 @@ clean:
split.OTHER checkstr.OK split.OTHER checkstr.OK
.PHONY: all install uninstall clean test .PHONY: all install uninstall clean test

16
devel/fossology-nomos-standalone/files/patch-src_nomos_agent_STRINGS.in
View file

@ -1,16 +0,0 @@
--- src/nomos/agent/STRINGS.in.orig 2018-11-29 10:09:35 UTC
+++ src/nomos/agent/STRINGS.in
@@ -1782,11 +1782,11 @@
#
%ENTRY% _LT_DUAL_LICENSE_46
%KEY% =NULL=
-%STR% "as an alternative.{,20}you may use this file under"
+%STR% "as an alternative.{0,20}you may use this file under"
#
%ENTRY% _LT_DUAL_LICENSE_47
%KEY% =NULL=
-%STR% "under the terms of either.{,15}or"
+%STR% "under the terms of either.{0,15}or"
#
%ENTRY% _LT_SUBSEQUENT_VERSION
%KEY% "licen[cs]"