equal
deleted
inserted
replaced
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 |
25 |
26 include ../../make-rules/shared-macros.mk |
26 include ../../make-rules/shared-macros.mk |
27 |
27 |
28 COMPONENT_NAME= conflict |
28 COMPONENT_NAME= conflict |
33 COMPONENT_PROJECT_URL= http://invisible-island.net/conflict/conflict.html |
33 COMPONENT_PROJECT_URL= http://invisible-island.net/conflict/conflict.html |
34 COMPONENT_ARCHIVE_HASH= \ |
34 COMPONENT_ARCHIVE_HASH= \ |
35 sha256:e795d7d580d2a2bb5081bcf9b0efe6d86567fd29770c60de90da7c07105bfeb9 |
35 sha256:e795d7d580d2a2bb5081bcf9b0efe6d86567fd29770c60de90da7c07105bfeb9 |
36 COMPONENT_ARCHIVE_URL= ftp://invisible-island.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) |
36 COMPONENT_ARCHIVE_URL= ftp://invisible-island.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) |
37 COMPONENT_BUGDB= utility/conflict |
37 COMPONENT_BUGDB= utility/conflict |
|
38 |
|
39 TPNO= 8338 |
38 |
40 |
39 include ../../make-rules/prep.mk |
41 include ../../make-rules/prep.mk |
40 include ../../make-rules/configure.mk |
42 include ../../make-rules/configure.mk |
41 include ../../make-rules/ips.mk |
43 include ../../make-rules/ips.mk |
42 |
44 |