Here we drop support for the slave port, since it never quite worked
as desired, nor was it ever submitted, and removes the conditionals to support
it. Also, we add a new default option FACTER_JAVA to build support for Java
and install facter.jar to be used by sysutils/puppetserver5
Details
Poudriere testport
Diff Detail
- Repository
- rP FreeBSD ports repository
- Lint
No Lint Coverage - Unit
No Test Coverage - Build Status
Buildable 11774 Build 12118: arc lint + arc unit
Event Timeline
I think the JAVA_BUILD here is making openjdk8 a run time dependency, but I only want it to be a build-time dependency. I'm reading.
Nevermind, that must have been installed in the jail as part of the build and left there. I can remove openjdk8 from the jail without de-installation of facter.
Makefile | ||
---|---|---|
4–5 | probably no need to go from 0 to 2 directly. | |
5–6 | Why ?= ? | |
27 | Why += ? Also, it happens too early. | |
30–31 | why += ? Also, it happens too late. | |
37 | typo ? (and missing tab after =) | |
41–44 | FACTER_JAVA_VARS= JAVA_BUILD=yes FACTER_JAVA_CMAKE_ON= -DJAVA_HOME=... | |
54 | This should be post-install-FACTER_JAVA-on: | |
56 | you can drop the PKGNAMEPREFIX test here. | |
pkg-plist | ||
24 | This probably needs to be guarded by a %%FACTER_JAVA%% as it is optional. (And also add OPTIONS_SUB=yes in the Makefile.) |
Makefile | ||
---|---|---|
5–6 | This was introduced when we where working on a slave port, and the salve would have been in the java category. This is usually done by setting the category using '?=' in the master port and with '=' in the slave port. Here is the commit where it was introduced: Since we drop this slave port, this can be revert to '='. | |
27 | I guess it's a mistake I introduced. Could be replaced by a simple '='. | |
30–31 | There is a USES=cmake on line 15, and since the conditional on line 17 was removed, everything should be moved to a single USES assignation. | |
54 | I am pretty sure that this target is useless. I had this code in order to only install the produced jar file (without running make install). But since now we build the jar file if the option is selected, I guess that the make install stage will copy the .jar file at the right location automatically. | |
56 | Yep, it was used to determine if the user was installing sysutils/facter or sysutils/java-facter. It is now useless. |
Makefile | ||
---|---|---|
4–5 | ?= was required in the master port so that the slave port could have a different one. Should be =. |