diff --git a/Makefile b/Makefile index fe0228ab6..725c4a299 100644 --- a/Makefile +++ b/Makefile @@ -9,26 +9,14 @@ umount: /sbin/umount -f ":${.CURDIR}/src" install: - # hardcode package meta files to catch mishaps - @cp ${.CURDIR}/pkg/+PRE_DEINSTALL ${DESTDIR} - @cp ${.CURDIR}/pkg/+POST_INSTALL ${DESTDIR} - @cp ${.CURDIR}/pkg/+MANIFEST ${DESTDIR} + # invoke pkg(8) bootstraping + @make -C ${.CURDIR}/pkg install # move all sources to their destination @mkdir -p ${DESTDIR}/usr/local @cp -r ${.CURDIR}/src/* ${DESTDIR}/usr/local # disable warnings for production systems @sed -i '' -e 's/E_STRICT/E_STRICT | E_WARNING/g' \ ${DESTDIR}/usr/local/etc/rc.php_ini_setup - # bootstrap pkg(8) files that are not in sources - @mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos - @cp ${.CURDIR}/pkg/OPNsense.conf ${DESTDIR}/usr/local/etc/pkg/repos - @echo /usr/local/etc/pkg/repos/OPNsense.conf - @cp ${.CURDIR}/pkg/pkg.conf ${DESTDIR}/usr/local/etc - @echo /usr/local/etc/pkg.conf - @mkdir -p ${DESTDIR}/usr/local/etc/pkg/fingerprints/OPNsense/trusted - @cp ${.CURDIR}/pkg/trusted/pkg.opnsense.org.20150402 \ - ${DESTDIR}/usr/local/etc/pkg/fingerprints/OPNsense/trusted - @echo /usr/local/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20150402 # finally pretty-print a list of files present @(cd ${.CURDIR}/src; find * -type f) | \ xargs -n1 printf "/usr/local/%s\n" diff --git a/pkg/Makefile b/pkg/Makefile new file mode 100644 index 000000000..45116a606 --- /dev/null +++ b/pkg/Makefile @@ -0,0 +1,19 @@ +all: + +install: + @cp ${.CURDIR}/+PRE_DEINSTALL ${DESTDIR} + @cp ${.CURDIR}/+POST_INSTALL ${DESTDIR} + @cp ${.CURDIR}/+MANIFEST ${DESTDIR} + @mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos + @cp ${.CURDIR}/OPNsense.conf ${DESTDIR}/usr/local/etc/pkg/repos + @echo /usr/local/etc/pkg/repos/OPNsense.conf + @cp ${.CURDIR}/pkg.conf ${DESTDIR}/usr/local/etc + @echo /usr/local/etc/pkg.conf + @cp ${.CURDIR}/config.xml.sample ${DESTDIR}/usr/local/etc + @echo "@sample /usr/local/etc/config.xml.sample" + @mkdir -p ${DESTDIR}/usr/local/etc/pkg/fingerprints/OPNsense/trusted + @cp ${.CURDIR}/trusted/pkg.opnsense.org.20150402 \ + ${DESTDIR}/usr/local/etc/pkg/fingerprints/OPNsense/trusted + @echo /usr/local/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20150402 + +.PHONY: install diff --git a/src/etc/config.xml b/pkg/config.xml.sample similarity index 100% rename from src/etc/config.xml rename to pkg/config.xml.sample