Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New version of the Avahi package with a redesigned interface. #566

Merged
merged 1 commit into from
Sep 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions net/pfSense-pkg-Avahi/Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-Avahi
PORTVERSION= 1.13
PORTVERSION= 2.0.0
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
EXTRACT_ONLY= # empty

MAINTAINER= coreteam@pfsense.org
COMMENT= pfSense package Avahi

LICENSE= APACHE20

LIB_DEPENDS= libavahi-core.so:net/avahi-app
RUN_DEPENDS= avahi-app>=0:net/avahi-app

NO_BUILD= yes
NO_MTREE= yes
Expand All @@ -24,22 +23,21 @@ do-extract:
${MKDIR} ${WRKSRC}

do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/pkg
${MKDIR} ${STAGEDIR}${PREFIX}/pkg/avahi
${MKDIR} ${STAGEDIR}/etc/inc/priv
${MKDIR} ${STAGEDIR}${PREFIX}/etc/avahi
${MKDIR} ${STAGEDIR}${PREFIX}/www
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} -m 0644 ${FILESDIR}${PREFIX}/pkg/avahi.xml \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/avahi.inc \
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/avahi.xml \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/avahi/avahi.inc \
${STAGEDIR}${PREFIX}/pkg/avahi
${INSTALL_DATA} ${FILESDIR}/etc/inc/priv/avahi.priv.inc \
${STAGEDIR}/etc/inc/priv
${INSTALL_DATA} ${FILESDIR}${PREFIX}/etc/avahi/ssh.service \
${STAGEDIR}${PREFIX}/etc/avahi
${INSTALL_DATA} ${FILESDIR}${PREFIX}/etc/avahi/sftp-ssh.service \
${STAGEDIR}${PREFIX}/etc/avahi
${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/avahi_settings.php \
${STAGEDIR}${PREFIX}/www

@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
${STAGEDIR}${DATADIR}/info.xml

Expand Down
8 changes: 4 additions & 4 deletions net/pfSense-pkg-Avahi/files/etc/inc/priv/avahi.priv.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* avahi.priv.inc
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2015 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2018 Denny Page
rbgarga marked this conversation as resolved.
Show resolved Hide resolved
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -22,10 +22,10 @@
global $priv_list;

$priv_list['page-services-avahi'] = array();
$priv_list['page-services-avahi']['name'] = "WebCfg - Services: Avahi package";
$priv_list['page-services-avahi']['descr'] = "Allow access to Avahi package GUI";
$priv_list['page-services-avahi']['name'] = "WebCfg - Services: Avahi";
$priv_list['page-services-avahi']['descr'] = "Access the Avahi package gui";

$priv_list['page-services-avahi']['match'] = array();
$priv_list['page-services-avahi']['match'][] = "pkg_edit.php?xml=avahi.xml*";
$priv_list['page-services-avahi']['match'][] = "avahi_settings.php*";

?>
36 changes: 0 additions & 36 deletions net/pfSense-pkg-Avahi/files/usr/local/etc/avahi/sftp-ssh.service

This file was deleted.

36 changes: 0 additions & 36 deletions net/pfSense-pkg-Avahi/files/usr/local/etc/avahi/ssh.service

This file was deleted.

Loading