18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 |
25 |
26 BITS=64 |
26 BITS=64 |
27 include ../../make-rules/shared-macros.mk |
27 include ../../make-rules/shared-macros.mk |
28 |
28 |
29 COMPONENT_NAME= conflict |
29 COMPONENT_NAME= conflict |
30 COMPONENT_VERSION= 20140723 |
30 COMPONENT_VERSION= 20150705 |
31 IPS_COMPONENT_VERSION= 0.2014.7.23 |
31 IPS_COMPONENT_VERSION= 0.2015.7.5 |
32 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) |
32 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) |
33 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tgz |
33 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tgz |
34 COMPONENT_PROJECT_URL= http://invisible-island.net/conflict/conflict.html |
34 COMPONENT_PROJECT_URL= http://invisible-island.net/conflict/conflict.html |
35 COMPONENT_ARCHIVE_HASH= \ |
35 COMPONENT_ARCHIVE_HASH= \ |
36 sha256:2ef48ef4c3e2b26eb2de7748ff07e296de3ab7a4437540d60e1fdf321fc5c943 |
36 sha256:30e14808768a938df139a1b76f8f7397e1b3bf46a18ceabcc8b1b1a70d5ea8a9 |
37 COMPONENT_ARCHIVE_URL= ftp://invisible-island.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) |
37 COMPONENT_ARCHIVE_URL= ftp://invisible-island.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) |
38 COMPONENT_BUGDB= utility/conflict |
38 COMPONENT_BUGDB= utility/conflict |
39 |
39 |
40 TPNO= 21547 |
40 TPNO= 27130 |
41 |
41 |
42 include $(WS_MAKE_RULES)/prep.mk |
42 include $(WS_MAKE_RULES)/prep.mk |
43 include $(WS_MAKE_RULES)/configure.mk |
43 include $(WS_MAKE_RULES)/configure.mk |
44 include $(WS_MAKE_RULES)/ips.mk |
44 include $(WS_MAKE_RULES)/ips.mk |
45 |
45 |