SF.net SVN: gar:[26756] csw/mgar/pkg/unbound/trunk/Makefile

[idogan23 at users.sourceforge.net]

Revision: 26756
          http://sourceforge.net/p/gar/code/26756
Author:   idogan23
Date:     2021-06-02 12:01:08 +0000 (Wed, 02 Jun 2021)
Log Message:
-----------
Unbound: Removed unneeded thins. Replaced libunbound2 by libundbound8

Modified Paths:
--------------
    csw/mgar/pkg/unbound/trunk/Makefile

Modified: csw/mgar/pkg/unbound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unbound/trunk/Makefile	2021-06-02 08:53:55 UTC (rev 26755)
+++ csw/mgar/pkg/unbound/trunk/Makefile	2021-06-02 12:01:08 UTC (rev 26756)
@@ -15,7 +15,7 @@
 DISTFILES += cswusergroup
 
 PACKAGING_PLATFORMS +=  solaris10-sparc solaris10-i386
-PACKAGES = CSWunbound CSWlibunbound2 CSWunbound-devel CSWunbound-host
+PACKAGES = CSWunbound CSWlibunbound8 CSWunbound-devel CSWunbound-host
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
@@ -43,34 +43,6 @@
 
 LICENSE = LICENSE
 
-# 64-Bit build disabled
-#EXTRA_BUILD_ISAS_i386   = amd64
-#EXTRA_BUILD_ISAS_sparc  = sparcv9
-
-#MERGE_DIRS_isa-sparcv9  = $(libdir)
-#MERGE_DIRS_isa-sparcv9 += $(sbindir)
-#MERGE_DIRS_isa-amd64  = $(libdir)
-#MERGE_DIRS_isa-amd64 += $(sbindir)
-
-#ISAXEC_DIRS                  = $(sbindir)
-#EXTRA_ISAEXEC_EXCLUDE_FILES  = $(sbindir)/unbound-anchor
-#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf
-#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control
-#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup
-#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host
-
-#EXTRA_MERGE_EXCLUDE_FILES_isa-amd64  = $(prefix)/sbin/unbound-anchor
-#EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-checkconf
-#EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-control
-#EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-control-setup
-#EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 += $(prefix)/sbin/unbound-host
-
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9  = $(prefix)/sbin/unbound-anchor
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-checkconf
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-control
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-control-setup
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 += $(prefix)/sbin/unbound-host
-
 SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf
 INITSMF                 = /etc/opt/csw/init.d/cswunbound
 USERGROUP               = /etc/opt/csw/CSWunbound/cswusergroup
@@ -79,23 +51,23 @@
 
 CATALOGNAME_CSWunbound       = unbound
 SPKG_DESC_CSWunbound         = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWunbound += CSWlibunbound2
+RUNTIME_DEP_PKGS_CSWunbound += CSWlibunbound8
 RUNTIME_DEP_PKGS_CSWunbound += CSWlibexpat1
-#RUNTIME_DEP_PKGS_CSWunbound += CSWlibldns1
 RUNTIME_DEP_PKGS_CSWunbound += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWunbound += CSWlibevent2-0-5
 
-CATALOGNAME_CSWlibunbound2       = libunbound2
-SPKG_DESC_CSWlibunbound2         = Library implementing DNS resolution and validation
-PKGFILES_CSWlibunbound2         += $(PKGFILES_RT)
-#RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibldns1
-RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWlibunbound2 += CSWlibevent2-0-5
+PACKAGES += CSWlibunbound8
+CATALOGNAME_CSWlibunbound8 = libunbound8
+PKGFILES_CSWlibunbound8 += $(call baseisadirs,$(libdir),libunbound\.so\.8\.1\.12)
+PKGFILES_CSWlibunbound8 += $(call baseisadirs,$(libdir),libunbound\.so\.8(\.\d+)*)
+SPKG_DESC_CSWlibunbound8 += $(DESCRIPTION), libunbound.so.8
+RUNTIME_DEP_PKGS_CSWlibunbound8 += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWlibunbound8 += CSWlibevent2-0-5
 
 CATALOGNAME_CSWunbound-devel       = unbound_devel
 SPKG_DESC_CSWunbound-devel         = $(DESCRIPTION) development package
 PKGFILES_CSWunbound-devel         += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWunbound-devel += CSWlibunbound2
+RUNTIME_DEP_PKGS_CSWunbound-devel += CSWlibunbound8
 
 CATALOGNAME_CSWunbound-host       = unbound_host
 SPKG_DESC_CSWunbound-host         = Unbound DNS lookup utility
@@ -102,7 +74,7 @@
 PKGFILES_CSWunbound-host         += $(sbindir)/unbound-host
 PKGFILES_CSWunbound-host         += $(mandir)/man1/unbound-host.1
 #RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibldns1
-RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibunbound2
+RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibunbound8
 RUNTIME_DEP_PKGS_CSWunbound-host += CSWlibssl1-0-0
 
 include gar/category.mk

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.