diff options
| author | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2020-02-10 09:01:02 +0100 |
|---|---|---|
| committer | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2020-02-12 18:16:47 +0100 |
| commit | d5dcbc38984cdbcdbcdf289e0b7f55df5f91b581 (patch) | |
| tree | 90cf6d3d29f47f74802a6eb551051fc94640059a /net/nginx-util | |
| parent | d8974e8cb49647ec83e95c5fe0c128a462557828 (diff) | |
nginx-util: resolve recursive CONFLICTS
Plus change the TITLE that it fits.
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
Diffstat (limited to 'net/nginx-util')
| -rw-r--r-- | net/nginx-util/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/nginx-util/Makefile b/net/nginx-util/Makefile index 46c98a1d6..5fd89878b 100644 --- a/net/nginx-util/Makefile +++ b/net/nginx-util/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx-util PKG_VERSION:=1.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at> include $(INCLUDE_DIR)/package.mk @@ -15,27 +15,27 @@ define Package/nginx-util/default SECTION:=net CATEGORY:=Network SUBMENU:=Web Servers/Proxies - TITLE:=Builder of LAN listen directives for Nginx + TITLE:=Nginx configurator DEPENDS:=+libstdcpp +libubus +libubox +libpthread endef define Package/nginx-util $(Package/nginx-util/default) - CONFLICTS:=nginx-ssl-util + CONFLICTS:=nginx-ssl-util-nopcre nginx-ssl-util endef define Package/nginx-ssl-util/default $(Package/nginx-util/default) - TITLE+= and manager of its SSL certificates + TITLE+= including SSL DEPENDS+= +libopenssl - CONFLICTS:=nginx-util + CONFLICTS:=,nginx-util endef define Package/nginx-ssl-util $(Package/nginx-ssl-util/default) TITLE+= (using PCRE) DEPENDS+= +libpcre - CONFLICTS+= nginx-ssl-util-nopcre + CONFLICTS+= ,nginx-ssl-util-nopcre endef define Package/nginx-ssl-util-nopcre |