From ea0eeadf15c5d6b8d9f532d17fba818138e5f90f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 17 Mar 2017 16:43:04 +0100 Subject: [PATCH] pkg: cluster changed lines between master and stable --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5cbe2c896..5ef9f53f1 100644 --- a/Makefile +++ b/Makefile @@ -58,15 +58,16 @@ CORE_REPOSITORY?= ${CORE_ABI}/libressl CORE_REPOSITORY?= ${FLAVOUR} .endif -CORE_PACKAGESITE?= http://pkg.opnsense.org - CORE_NAME?= opnsense-devel CORE_FAMILY?= development +CORE_MESSAGE?= Insert Name Here + +CORE_MAINTAINER?= franco@opnsense.org +CORE_PACKAGESITE?= http://pkg.opnsense.org CORE_ORIGIN?= opnsense/${CORE_NAME} CORE_COMMENT?= OPNsense ${CORE_FAMILY} package -CORE_MAINTAINER?= franco@opnsense.org CORE_WWW?= https://opnsense.org/ -CORE_MESSAGE?= Insert Name Here + # CORE_DEPENDS_armv6 is empty CORE_DEPENDS_amd64?= beep bsdinstaller CORE_DEPENDS_i386?= ${CORE_DEPENDS_amd64}