Index: head/devel/fossology-nomos-standalone/Makefile =================================================================== --- head/devel/fossology-nomos-standalone/Makefile (revision 486610) +++ head/devel/fossology-nomos-standalone/Makefile (revision 486611) @@ -1,34 +1,32 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= fossology -PORTVERSION= 3.3.0 +PORTVERSION= 3.4.0 CATEGORIES= devel PKGNAMESUFFIX= -nomos-standalone MAINTAINER= amdmi3@FreeBSD.org COMMENT= Standalone Nomos license scanner from fossology project -LICENSE= GPLv2 LGPL21 -LICENSE_COMB= multi -LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING -LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= gawk:lang/gawk USE_GITHUB= yes -GH_TAGNAME= 660fc06 USES= gmake gettext pkgconfig USE_GNOME= glib20 BUILD_WRKSRC= ${WRKSRC}/src/nomos/agent MAKEFILE= Makefile.sa MAKE_JOBS_UNSAFE= yes +ALL_TARGET= nomossa PLIST_FILES= bin/nomossa do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/nomos/agent/nomossa ${STAGEDIR}${PREFIX}/bin .include Index: head/devel/fossology-nomos-standalone/distinfo =================================================================== --- head/devel/fossology-nomos-standalone/distinfo (revision 486610) +++ head/devel/fossology-nomos-standalone/distinfo (revision 486611) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525789205 -SHA256 (fossology-fossology-3.3.0-660fc06_GH0.tar.gz) = f056c2fead153042e4bae54c0678da21ba50458156e3f0f15d82af09e281d55c -SIZE (fossology-fossology-3.3.0-660fc06_GH0.tar.gz) = 14160449 +TIMESTAMP = 1543848059 +SHA256 (fossology-fossology-3.4.0_GH0.tar.gz) = 5a984e9a464f00c8455ba27a04f503b269e9f8e4e0d859b8000ecf31aa2078e9 +SIZE (fossology-fossology-3.4.0_GH0.tar.gz) = 19826517 Index: head/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_STRINGS.in =================================================================== --- head/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_STRINGS.in (revision 486610) +++ head/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_STRINGS.in (nonexistent) @@ -1,105 +0,0 @@ -commit 9a138091eb231c1cf552e41f8d35d4f4e12eb985 -Author: Dmitry Marakasov -Date: Sat Apr 28 20:27:43 2018 +0300 - - fix(nomos): fix posix incomparible regular expressions - -diff --git src/nomos/agent/STRINGS.in src/nomos/agent/STRINGS.in -index 706dcabca..c64f75b64 100644 ---- src/nomos/agent/STRINGS.in -+++ src/nomos/agent/STRINGS.in -@@ -1299,7 +1299,7 @@ - ##### - %ENTRY% _LT_COMMERCIAL_5 - %KEY% "license" --%STR% "((may|can)|( be|)) used? (this file |)in accordance with the commercial license agreement" -+%STR% "((may|can)|( be)?) used? (this file )?in accordance with the commercial license agreement" - ##### - %ENTRY% _LT_COMMERCIAL_6 - %KEY% "license" -@@ -1652,7 +1652,7 @@ - # - %ENTRY% _LT_DUAL_LICENSE_28 - %KEY% "licen[cs]" --%STR% "either under the terms of =SOME= license (version|) =SOME= or at your option under =SOME= license" -+%STR% "either under the terms of =SOME= license (version)? =SOME= or at your option under =SOME= license" - # - %ENTRY% _LT_DUAL_LICENSE_29 - %KEY% "licen[cs]" -@@ -2321,7 +2321,7 @@ - # - %ENTRY% _LT_FREE_94 - %KEY% "permi[st]" --%STR% "permission is granted to r?e?-?distribute =FEW= in any (manner|way) provid(ed|ing) (that |)this (copyright |)notice (remains intact|(is (not modified|acknowledged|not removed)))" -+%STR% "permission is granted to r?e?-?distribute =FEW= in any (manner|way) provid(ed|ing) (that )?this (copyright )?notice (remains intact|(is (not modified|acknowledged|not removed)))" - # - %ENTRY% _LT_FREE_95 - %KEY% "distribut" -@@ -3891,7 +3891,7 @@ - # - %ENTRY% _LT_MIT_4 - %KEY% "permi[st]" --%STR% "permission to use copy modify and/?o?r? distribute this (software|program) for any purpose (with or|and) without fee is hereby granted provided that (the above|this) copyright (notice|) and (this|) permission notice appear (in|on) all copies" -+%STR% "permission to use copy modify and/?o?r? distribute this (software|program) for any purpose (with or|and) without fee is hereby granted provided that (the above|this) copyright (notice)? and (this)? permission notice appear (in|on) all copies" - # - %ENTRY% _LT_MIT_5 - %KEY% "permi[st]" -@@ -6229,7 +6229,7 @@ k - # - %ENTRY% _LT_SEE_OTHER_11 - %KEY% "(©|\(c\)|copyright|\[^+:]|©)" --%STR% "see =FEW= for (the |)copyright (information|notice)" -+%STR% "see =FEW= for (the )?copyright (information|notice)" - # - %ENTRY% _LT_SEE_OTHER_12 - %KEY% "copyright" -@@ -6249,7 +6249,7 @@ k - # - %ENTRY% _LT_SEE_OTHER_16 - %KEY% "copyright" --%STR% "for conditions? =FEW= and use see (the |)copyright notice" -+%STR% "for conditions? =FEW= and use see (the )?copyright notice" - # - %ENTRY% _LT_SEE_OTHER_17 - %KEY% "copyright" -@@ -8264,22 +8264,22 @@ k - %ENTRY% _TITLE_MPL10 - %KEY% "\<([mn]pl|mozilla|netscape)\>" - #%STR% "mozilla public licen[cs]e (1\.?0|(\ |v|version )1\.?0)" --%STR% "mozilla public licen[cs]e (1\.?0|(mpl |)((v\.? ?|version )1\.?0))" -+%STR% "mozilla public licen[cs]e (1\.?0|(mpl )?((v\.? ?|version )1\.?0))" - # - %ENTRY% _TITLE_MPL11 - %KEY% "\<([mn]pl|mozilla|netscape)\>" - #%STR% "mozilla public licen[cs]e (1\.?1|(\ |v|version )1\.?1)" --%STR% "mozilla public licen[cs]e (1\.?1|(mpl |)((v\.? ?|version )1\.?1))" -+%STR% "mozilla public licen[cs]e (1\.?1|(mpl )?((v\.? ?|version )1\.?1))" - # - %ENTRY% _TITLE_MPL11_OR_LATER - %KEY% "licen[cs]" - #%STR% "mozilla public licen[cs]e (1\.?1|(\ |v|version )1\.?1) =SOME= or =SOME= (newer|later|subsequent|more recent)" --%STR% "mozilla public licen[cs]e (1\.?1|(mpl |)((v\.? ?|version )1\.?1)) =SOME= or =SOME= (newer|later|subsequent|more recent)" -+%STR% "mozilla public licen[cs]e (1\.?1|(mpl )?((v\.? ?|version )1\.?1)) =SOME= or =SOME= (newer|later|subsequent|more recent)" - # - %ENTRY% _TITLE_MPL20 - %KEY% "\<([mn]pl|mozilla|netscape)\>" - #%STR% "mozilla public licen[cs]e (2\.?0|(\ |v\.? ?|version )2\.?0)" --%STR% "mozilla public licen[cs]e (2\.?0|(mpl |)((v\.? ?|version )2\.?0))" -+%STR% "mozilla public licen[cs]e (2\.?0|(mpl )?((v\.? ?|version )2\.?0))" - # - %ENTRY% _TITLE_MPL20_EXCEPTION - %KEY% "licen[cs]" -@@ -9083,11 +9083,11 @@ k - # - %ENTRY% _PHR_COPYLEFT_NEXT_030 - %KEY% "licen[cs]" --%STR% "(r?e?distributed|available|licensed) under copyleft-next( |-)0\.?3\.?0 (licen[cs]e|)" -+%STR% "(r?e?distributed|available|licensed) under copyleft-next( |-)0\.?3\.?0 (licen[cs]e)?" - # - %ENTRY% _PHR_COPYLEFT_NEXT_031 - %KEY% "licen[cs]" --%STR% "(r?e?distributed|available|licensed) under copyleft-next( |-)0\.?3\.?1 (licen[cs]e|)" -+%STR% "(r?e?distributed|available|licensed) under copyleft-next( |-)0\.?3\.?1 (licen[cs]e)?" - # - %ENTRY% _PHR_EULA - %KEY% "\<(end[ -]user|eula)\>" Property changes on: head/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_STRINGS.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_Makefile.sa =================================================================== --- head/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_Makefile.sa (revision 486610) +++ head/devel/fossology-nomos-standalone/files/patch-src_nomos_agent_Makefile.sa (revision 486611) @@ -1,74 +1,74 @@ --- src/nomos/agent/Makefile.sa.orig 2017-04-21 13:29:41 UTC +++ src/nomos/agent/Makefile.sa @@ -2,10 +2,6 @@ # This is to make a version of nomos that does not require any of the fossology build dependencies. # Copyright (C) 2013 Hewlett-Packard Development Company, L.P. -TOP = ../../.. -VARS = $(TOP)/Makefile.conf -include $(VARS) - EXE = nomossa SPEC = STRINGS.in @@ -19,33 +15,34 @@ GENOBJS = _precheck.o _autodata.o 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: $(EXE) ++all: encode $(EXE) debug: nomos-gl $(EXE): nomos.o $(OBJS) $(GENOBJS) - $(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS_LOCAL) -o $(EXE) + $(CC) nomos.o $(OBJS) $(GENOBJS) $(LDFLAGS) $(LDFLAGS_LOCAL) -o $(EXE) -nomos.o: nomos.c $(HDRS) $(DB) $(REPO) $(AGENTLIB) $(VARS) - $(CC) -c $< $(CFLAGS_LOCAL) $(DEFS) +nomos.o: nomos.c $(HDRS) $(REPO) $(AGENTLIB) $(VARS) + $(CC) -c $< $(CFLAGS) $(CFLAGS_LOCAL) nomos-gl: nomos-g.o $(OBJS) $(GENOBJS) - $(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS_LOCAL) -o $@ + $(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS) $(CFLAGS_LOCAL) -o $@ -nomos-g.o: nomos.c $(HDRS) $(DB) $(REPO) $(AGENTLIB) $(VARS) - $(CC) -c -l /usr/lib/libefence.a $< $(CFLAGS_LOCAL) +nomos-g.o: nomos.c $(HDRS) $(REPO) $(AGENTLIB) $(VARS) + $(CC) -c -l /usr/lib/libefence.a $< $(CFLAGS) $(CFLAGS_LOCAL) -$(OBJS) $(GENOBJS): %.o: %.c $(HDRS) $(DB) $(VARS) - $(CC) -c $< $(CFLAGS_LOCAL) +$(OBJS) $(GENOBJS): %.o: %.c $(HDRS) + $(CC) -c $< $(CFLAGS) $(CFLAGS_LOCAL) # # Non "standard" preprocessing stuff starts here... # encode: encode.o - $(CC) $(CFLAGS) -o $@ $@.c + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c _precheck.c: _autodata.c $(PRE) $(CHECK) # @echo "NOTE: _autodata.c has changed --> regenerate _precheck.c" @@ -53,7 +50,7 @@ _precheck.c: _autodata.c $(PRE) $(CHECK) ./$(CHECK) # @$(MAKE) $(STRINGS) $(KEYS) -_autodefs.h _autodata.c: $(SPEC) $(LICFIX) +_autodefs.h _autodata.c: $(SPEC) $(LICFIX) encode @echo "NOTE: GENSEARCHDATA takes 1-2 minutes to run" ./$(LICFIX) @@ -82,5 +79,3 @@ clean: split.OTHER checkstr.OK .PHONY: all install uninstall clean test - -include $(DEPS)