Download raw body.
[maintainer update] misc/{openhab,openhab-addons] 4.3.6->4.3.8
Hello,
I'm preparing to maintain two separate major versions of openHAB. The
below diff updates the 4x line to 4.3.8, and prepares the tree for a
future 5x (with new PLIST). I've looked at other ports to see how best
to do this.
Comments? Feedback? OK?
--
Chaz
diff --git a/misc/openhab-addons/4/Makefile b/misc/openhab-addons/4/Makefile
new file mode 100644
index 00000000000..d48d72178f2
--- /dev/null
+++ b/misc/openhab-addons/4/Makefile
@@ -0,0 +1,3 @@
+OH_VERSION= 4.3.8
+
+.include <bsd.port.mk>
diff --git a/misc/openhab-addons/4/distinfo b/misc/openhab-addons/4/distinfo
new file mode 100644
index 00000000000..ab301e18cfb
--- /dev/null
+++ b/misc/openhab-addons/4/distinfo
@@ -0,0 +1,2 @@
+SHA256 (openhab-addons-4.3.8.kar) = c0E1XJ/ySw4d1iFM1ZCVLWzcNGWbTipmJA4g+RPr8KA=
+SIZE (openhab-addons-4.3.8.kar) = 453077645
diff --git a/misc/openhab-addons/pkg/PLIST b/misc/openhab-addons/4/pkg/PLIST
similarity index 100%
rename from misc/openhab-addons/pkg/PLIST
rename to misc/openhab-addons/4/pkg/PLIST
diff --git a/misc/openhab-addons/Makefile b/misc/openhab-addons/Makefile
index 14ff318b667..516fb6f465f 100644
--- a/misc/openhab-addons/Makefile
+++ b/misc/openhab-addons/Makefile
@@ -1,28 +1,5 @@
-COMMENT= addons for openHAB
+SUBDIR =
+SUBDIR += 4
+#SUBDIR += 5
-V= 4.3.6
-DISTNAME= openhab-addons-${V}
-
-CATEGORIES= misc
-
-HOMEPAGE= https://www.openhab.org/
-
-MAINTAINER= Chaz Kettleson <chaz@pyr3x.com>
-
-# EPL-2.0
-PERMIT_PACKAGE= Yes
-
-SITES= https://github.com/openhab/openhab-distro/releases/download/${V}/
-EXTRACT_SUFX= .kar
-EXTRACT_ONLY=
-
-NO_BUILD= Yes
-NO_TEST= Yes
-
-SUBST_VARS= V
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/libexec/openhab/addons/
- cp ${FULLDISTDIR}/${ALL_DISTFILES} ${PREFIX}/libexec/openhab/addons/
-
-.include <bsd.port.mk>
+.include <bsd.port.subdir.mk>
diff --git a/misc/openhab-addons/Makefile.inc b/misc/openhab-addons/Makefile.inc
new file mode 100644
index 00000000000..10cb188dd79
--- /dev/null
+++ b/misc/openhab-addons/Makefile.inc
@@ -0,0 +1,30 @@
+COMMENT= addons for openHAB
+
+V= ${OH_VERSION}
+DISTNAME= openhab-addons-${V}
+
+CATEGORIES= misc
+
+HOMEPAGE= https://www.openhab.org/
+
+MAINTAINER= Chaz Kettleson <chaz@pyr3x.com>
+
+# EPL-2.0
+PERMIT_PACKAGE= Yes
+
+SITES= https://github.com/openhab/openhab-distro/releases/download/${V}/
+EXTRACT_SUFX= .kar
+EXTRACT_ONLY=
+
+DESCR= ${.CURDIR}/../pkg/DESCR
+
+NO_BUILD= Yes
+NO_TEST= Yes
+
+SUBST_VARS= V
+
+do-install:
+ ${SUBST_DATA} ${.CURDIR}/../pkg/README \
+ ${WRKINST}${LOCALBASE}/share/doc/pkg-readmes/${PKGSTEM}
+ ${INSTALL_DATA_DIR} ${PREFIX}/libexec/openhab/addons/
+ cp ${FULLDISTDIR}/${ALL_DISTFILES} ${PREFIX}/libexec/openhab/addons/
diff --git a/misc/openhab-addons/distinfo b/misc/openhab-addons/distinfo
deleted file mode 100644
index adb563bc1e1..00000000000
--- a/misc/openhab-addons/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openhab-addons-4.3.6.kar) = v87qvrTY1xLLKlMJEiXntt5YKbAaLoQsKEfDSbO+nRM=
-SIZE (openhab-addons-4.3.6.kar) = 452457282
diff --git a/misc/openhab/4/Makefile b/misc/openhab/4/Makefile
new file mode 100644
index 00000000000..84afe00371a
--- /dev/null
+++ b/misc/openhab/4/Makefile
@@ -0,0 +1,4 @@
+OH_VERSION= 4.3.8
+MODJAVA_VER= 17
+
+.include <bsd.port.mk>
diff --git a/misc/openhab/4/distinfo b/misc/openhab/4/distinfo
new file mode 100644
index 00000000000..e3072c9be80
--- /dev/null
+++ b/misc/openhab/4/distinfo
@@ -0,0 +1,2 @@
+SHA256 (openhab-4.3.8.tar.gz) = PQUcFK4G+teXgOm9MkloIyjf0SpsR/kUSA+CmBP5oXk=
+SIZE (openhab-4.3.8.tar.gz) = 111154063
diff --git a/misc/openhab/pkg/PLIST b/misc/openhab/4/pkg/PLIST
similarity index 100%
rename from misc/openhab/pkg/PLIST
rename to misc/openhab/4/pkg/PLIST
diff --git a/misc/openhab/Makefile b/misc/openhab/Makefile
index 1230607fced..516fb6f465f 100644
--- a/misc/openhab/Makefile
+++ b/misc/openhab/Makefile
@@ -1,41 +1,5 @@
-COMMENT= integration platform for home automation
+SUBDIR =
+SUBDIR += 4
+#SUBDIR += 5
-V= 4.3.6
-DISTNAME= openhab-${V}
-
-CATEGORIES= misc
-
-HOMEPAGE= https://www.openhab.org/
-
-MAINTAINER= Chaz Kettleson <chaz@pyr3x.com>
-
-# EPL-2.0
-PERMIT_PACKAGE= Yes
-
-SITES= https://github.com/openhab/openhab-distro/releases/download/${V}/
-
-MODULES= java
-MODJAVA_VER= 17
-
-RUN_DEPENDS= java/javaPathHelper
-
-NO_BUILD= Yes
-NO_TEST= Yes
-
-SUBST_VARS= V
-
-TAR= tar -C ${WRKDIST}
-
-pre-extract:
- mkdir ${WRKDIST}
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openhab/
- ${INSTALL_DATA} ${FILESDIR}/openhab.conf \
- ${PREFIX}/share/examples/openhab/
- ${INSTALL_DATA_DIR} ${PREFIX}/libexec/openhab/
- cd ${WRKDIST} && pax -rw . ${PREFIX}/libexec/openhab/
- mv ${PREFIX}/libexec/openhab/conf ${PREFIX}/share/examples/openhab/
- mv ${PREFIX}/libexec/openhab/userdata ${PREFIX}/share/examples/openhab/
-
-.include <bsd.port.mk>
+.include <bsd.port.subdir.mk>
diff --git a/misc/openhab/Makefile.inc b/misc/openhab/Makefile.inc
new file mode 100644
index 00000000000..288c3ba15da
--- /dev/null
+++ b/misc/openhab/Makefile.inc
@@ -0,0 +1,44 @@
+COMMENT= integration platform for home automation
+
+V= ${OH_VERSION}
+DISTNAME= openhab-${V}
+
+CATEGORIES= misc
+
+HOMEPAGE= https://www.openhab.org/
+
+MAINTAINER= Chaz Kettleson <chaz@pyr3x.com>
+
+# EPL-2.0
+PERMIT_PACKAGE= Yes
+
+SITES= https://github.com/openhab/openhab-distro/releases/download/${V}/
+
+MODULES= java
+
+DESCR= ${.CURDIR}/../pkg/DESCR
+FILESDIR= ${.CURDIR}/../files
+
+RUN_DEPENDS= java/javaPathHelper
+
+NO_BUILD= Yes
+NO_TEST= Yes
+
+SUBST_VARS= V
+
+TAR= tar -C ${WRKDIST}
+
+pre-extract:
+ mkdir ${WRKDIST}
+
+do-install:
+ ${SUBST_CMD} -c -m 555 ${.CURDIR}/../pkg/openhab.rc ${WRKINST}${RCDIR}/openhab
+ ${SUBST_DATA} ${.CURDIR}/../pkg/README \
+ ${WRKINST}${LOCALBASE}/share/doc/pkg-readmes/${PKGSTEM}
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openhab/
+ ${INSTALL_DATA} ${FILESDIR}/openhab.conf \
+ ${PREFIX}/share/examples/openhab/
+ ${INSTALL_DATA_DIR} ${PREFIX}/libexec/openhab/
+ cd ${WRKDIST} && pax -rw . ${PREFIX}/libexec/openhab/
+ mv ${PREFIX}/libexec/openhab/conf ${PREFIX}/share/examples/openhab/
+ mv ${PREFIX}/libexec/openhab/userdata ${PREFIX}/share/examples/openhab/
diff --git a/misc/openhab/distinfo b/misc/openhab/distinfo
deleted file mode 100644
index 038c15bec3f..00000000000
--- a/misc/openhab/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openhab-4.3.6.tar.gz) = hXm0kHvUsqpkNSkoCOIOqfK+7cTYrAFnw4DbIVqTKfI=
-SIZE (openhab-4.3.6.tar.gz) = 111170509
[maintainer update] misc/{openhab,openhab-addons] 4.3.6->4.3.8