From aa69b4fde7a40ff67fe04e15807e0ea9ecae69f7 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 15 Mar 2017 01:56:44 +0100
Subject: [PATCH] Mk: add descriptions via pkg-descr and start with quagga

---
 Mk/plugins.mk        | 11 ++++++++---
 README.md            |  2 +-
 net/quagga/Makefile  |  2 +-
 net/quagga/pkg-descr |  2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 net/quagga/pkg-descr

diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index 7977beb61..21ef34a4d 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2016 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2015-2017 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -28,7 +28,7 @@ all: check
 LOCALBASE?=		/usr/local
 PKG!=			which pkg || echo true
 
-PLUGIN_DESC!=		git rev-list HEAD --max-count=1 | cut -c1-9
+PLUGIN_DESC=		pkg-descr
 PLUGIN_SCRIPTS=		+PRE_INSTALL +POST_INSTALL \
 			+PRE_DEINSTALL +POST_DEINSTALL
 
@@ -72,7 +72,6 @@ manifest: check
 	@echo "version: \"${PLUGIN_PKGVERSION}\""
 	@echo "origin: opnsense/${PLUGIN_PKGNAME}"
 	@echo "comment: \"${PLUGIN_COMMENT}\""
-	@echo "desc: \"${PLUGIN_DESC}\""
 	@echo "maintainer: \"${PLUGIN_MAINTAINER}\""
 	@echo "categories: [ \"${.CURDIR:S/\// /g:[-2]}\" ]"
 	@echo "www: \"${PLUGIN_WWW}\""
@@ -165,10 +164,16 @@ plist: check
 	done
 	@echo "${LOCALBASE}/opnsense/version/${PLUGIN_NAME}"
 
+description: check
+	@if [ -f ${.CURDIR}/${PLUGIN_DESC} ]; then \
+		cat ${.CURDIR}/${PLUGIN_DESC}; \
+	fi
+
 metadata: check
 	@mkdir -p ${DESTDIR}
 	@${MAKE} DESTDIR=${DESTDIR} scripts
 	@${MAKE} DESTDIR=${DESTDIR} manifest > ${DESTDIR}/+MANIFEST
+	@${MAKE} DESTDIR=${DESTDIR} description > ${DESTDIR}/+DESC
 	@${MAKE} DESTDIR=${DESTDIR} plist > ${DESTDIR}/plist
 
 collect: check
diff --git a/README.md b/README.md
index 0eaf8c1b6..dbbdbeb85 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ net/igmp-proxy -- IGMP-Proxy Service
 net/l2tp -- L2TP server based on MPD5
 net/pppoe -- PPPoE server based on MPD5
 net/pptp -- PPTP server based on MPD5
-net/quagga -- Plugin to manage the quagga routing daemon software which offers routing protocols like RIP, IS-IS and OSPF to guide your packets through the sea
+net/quagga -- Quagga Routing Suite
 net/relayd -- Relayd Load Balancer
 net/upnp -- Universal Plug and Play Service
 net/wol -- Wake on LAN Service
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 378ca5509..5c5e15160 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=       quagga
 PLUGIN_VERSION=    0.0.1
-PLUGIN_COMMENT=    Plugin to manage the quagga routing daemon software which offers routing protocols like RIP, IS-IS and OSPF to guide your packets through the sea
+PLUGIN_COMMENT=    Quagga Routing Suite
 PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
 PLUGIN_DEVEL =     yes
 
diff --git a/net/quagga/pkg-descr b/net/quagga/pkg-descr
new file mode 100644
index 000000000..8bbde73ac
--- /dev/null
+++ b/net/quagga/pkg-descr
@@ -0,0 +1,2 @@
+Manage the Quagga Routing Software Suite, which offers routing protocols
+like RIP, IS-IS and OSPF to guide your packets through the sea.