Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Link pbi-manager10 into the build, fix ports pkg-plist if installing

to 10.x or higher
  • Loading branch information...
commit c405e829f0c09d0db4b2e5699f8efca3fc0dde3d 1 parent 3b7aa60
Kris Moore kmoore134 authored
19 src-sh/Makefile
View
@@ -35,6 +35,7 @@ SUBTARGETS = \
sub-pcfbsd \
sub-pcfirst \
sub-pbi \
+ sub-pbi10 \
sub-deinfo \
sub-meta \
sub-warden \
@@ -262,6 +263,19 @@ sub-pbi-clean: pbi-manager/$(MAKEFILE) FORCE
sub-pbi-install_subtargets: pbi-manager/$(MAKEFILE) FORCE
cd pbi-manager/ && $(MAKE) -f $(MAKEFILE) install
+sub-pbi10: pbi-manager10/$(MAKEFILE) FORCE
+ cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE)
+sub-pbi10-make_default: pbi-manager10/$(MAKEFILE) FORCE
+ cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE)
+sub-pbi10-make_first: pbi-manager10/$(MAKEFILE) FORCE
+ cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) first
+sub-pbi10-all: pbi-manager10/$(MAKEFILE) FORCE
+ cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) all
+sub-pbi10-clean: pbi-manager10/$(MAKEFILE) FORCE
+ cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) clean
+sub-pbi10-install_subtargets: pbi-manager10/$(MAKEFILE) FORCE
+ cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) install
+
sub-meta: pc-metapkgmanager/$(MAKEFILE) FORCE
cd pc-metapkgmanager/ && $(MAKE) -f $(MAKEFILE)
sub-meta-make_default: pc-metapkgmanager/$(MAKEFILE) FORCE
@@ -304,6 +318,7 @@ sub-pcthinclient-install_subtargets: pc-thinclient/$(MAKEFILE) FORCE
make_default: sub-libsh-make_default \
sub-lpreserver-make_default \
sub-pbi-make_default \
+ sub-pbi10-make_default \
sub-about-make_default \
sub-meta-make_default \
sub-warden-make_default \
@@ -326,6 +341,7 @@ make_default: sub-libsh-make_default \
make_first: sub-libsh-make_first \
sub-lpreserver-make_first \
sub-pbi-make_first \
+ sub-pbi10-make_first \
sub-about-make_first \
sub-meta-make_first \
sub-warden-make_first \
@@ -348,6 +364,7 @@ make_first: sub-libsh-make_first \
all: sub-libsh-all \
sub-lpreserver-all \
sub-pbi-all \
+ sub-pbi10-all \
sub-about-all \
sub-meta-all \
sub-warden-all \
@@ -368,6 +385,7 @@ all: sub-libsh-all \
FORCE
clean: sub-pbi-clean \
+ sub-pbi10-clean \
sub-libsh-clean \
sub-lpreserver-clean \
sub-about-clean \
@@ -391,6 +409,7 @@ clean: sub-pbi-clean \
install_subtargets: sub-libsh-install_subtargets \
sub-pbi-install_subtargets \
+ sub-pbi10-install_subtargets \
sub-lpreserver-install_subtargets \
sub-about-install_subtargets \
sub-meta-install_subtargets \
10 src-sh/pbi-manager/install.sh
View
@@ -2,11 +2,11 @@
# pbi-manager installation script
# Check if this is for the right version of FreeBSD
-#verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`"
-#if [ $verCheck -gt 1000000 ] ; then
-# # This version is for FreeBSD <= 10
-# exit 0
-#fi
+verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`"
+if [ $verCheck -gt 1000000 ] ; then
+ # This version is for FreeBSD <= 10
+ exit 0
+fi
DEFAULT="/usr/local"
18 src-sh/pbi-manager10/install.sh
View
@@ -5,7 +5,7 @@
verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`"
if [ $verCheck -lt 1000000 ] ; then
# This version is for FreeBSD >= 10
- #exit 0
+ exit 0
fi
DEFAULT="/usr/local"
@@ -110,7 +110,7 @@ if [ `uname -m` = "amd64" ] ; then
chmod 644 pbiwrapper
mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386
else
- touch ${LB}/share/pbi-manager/.pbiwrapper-i386
+ touch ${LB}/share/pbi-manager/.pbiwrapper-amd64
fi
# Build system arch wrapper
@@ -126,10 +126,20 @@ chmod 644 pbiwrapper
mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m`
# Install the pbime wrapper
-cd ${DIR}/pbime && make install
+cd ${DIR}/pbime && make
+install -o root -g wheel -m 4751 pbime ${LB}/share/pbi-manager/.pbime
+install -o root -g wheel -m 755 pbimount ${LB}/share/pbi-manager/.pbimount
+if [ "${LB}" = "/usr/local" ] ; then
+ install -o root -g wheel -m 4751 pbime /usr/pbi/.pbime
+ install -o root -g wheel -m 755 pbimount /usr/pbi/.pbimount
+fi
# Install the nullfs binary
-cd ${DIR}/mount_nullfs && make install
+cd ${DIR}/mount_nullfs && make
+install -o root -g wheel -m 755 mount_nullfs ${LB}/share/pbi-manager/.mount_nullfs
+if [ "${LB}" = "/usr/local" ] ; then
+ install -o root -g wheel -m 755 mount_nullfs /usr/pbi/.mount_nullfs
+fi
# Install the MANPATH conf
if [ ! -d "${LB}/etc/man.d" ] ; then
7 src-sh/port-files/Makefile
View
@@ -33,6 +33,13 @@ USE_PYTHON= yes
IGNORE= requires FreeBSD 9.0 or later
.endif
+.if ${OSVERSION} > 1000000
+PLIST_FILES+= share/pbi-manager/.pbime \
+ share/pbi-manager/.pbimount \
+ share/pbi-manager/.mount_nullfs \
+ etc/man.d/pbi.conf
+.endif
+
do-install:
cd ${WRKSRC} && make install PREFIX=${STAGEDIR}${PREFIX}
7 src-sh/port-files/pkg-install
View
@@ -27,4 +27,11 @@ else
cp ${PREFIX}/share/pbi-manager/.pbiwrapper-i386 /usr/pbi/.pbiwrapper-i386
fi
+# If on FreeBSD > 10, install the PBI mounting files
+if [ -e "${PREFIX}/share/pbi-manager/.pbime" ] ; then
+ install -o root -g wheel -m 4751 ${PREFIX}/share/pbi-manager/.pbime /usr/pbi/.pbime
+ install -o root -g wheel -m 755 ${PREFIX}/share/pbi-manager/.pbimount /usr/pbi/.pbimount
+ install -o root -g wheel -m 755 ${PREFIX}/share/pbi-manager/.mount_nullfs /usr/pbi/.mount_nullfs
+fi
+
exit 0
Please sign in to comment.
Something went wrong with that request. Please try again.