Revision: 15420 http://gar.svn.sourceforge.net/gar/?rev=15420&view=rev Author: wahwah Date: 2011-08-24 07:39:31 +0000 (Wed, 24 Aug 2011)
Log Message: ----------- pkg/tcpwrappers/trunk: pkg split, using libwrap.so.0 Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2011-08-24 07:31:49 UTC (rev 15419) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2011-08-24 07:39:31 UTC (rev 15420) @@ -1,4 +1,7 @@ # $Id$ +# +# files/README describes that there are two versions of hosts.{allow,deny} +# syntaxes. NAME = tcp_wrappers BASEVERSION = 7.6 @@ -26,6 +29,7 @@ PACKAGES = CSWtcpwrap CATALOGNAME = tcpwrappers +SPKG_DESC_CSWtcpwrap = $(DESCRIPTION) SPKG_VERSION = $(BASEVERSION) @@ -49,8 +53,8 @@ # No test suite TEST_SCRIPTS = -LIBNAME_EXTENDED-off = libwrap-std.so.1 -LIBNAME_EXTENDED-on = libwrap-ext.so.1 +LIBNAME_EXTENDED-off = libwrap-std.so.0 +LIBNAME_EXTENDED-on = libwrap-ext.so.0 INSTALL_SCRIPTS = custom @@ -66,13 +70,24 @@ MIGRATE_FILES = hosts.allow hosts.deny ALTERNATIVES = std ext -ALTERNATIVE_std = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-std.so.1 200 -ALTERNATIVE_std += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-std.so.1 -ALTERNATIVE_ext = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-ext.so.1 100 -ALTERNATIVE_ext += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-ext.so.1 +ALTERNATIVE_std = $(libdir)/libwrap.so.0 tcpwrappers $(libdir)/libwrap-std.so.0 200 +ALTERNATIVE_std += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.0 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-std.so.0 +ALTERNATIVE_ext = $(libdir)/libwrap.so.0 tcpwrappers $(libdir)/libwrap-ext.so.0 100 +ALTERNATIVE_ext += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.0 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-ext.so.0 POSTMSG = $(docdir)/$(CATALOGNAME)/CSWtcpwrap.postmsg +PACKAGES += CSWlibwrap0 +CATALOGNAME_CSWlibwrap0 = libwrap0 +PKGFILES_CSWlibwrap0 += $(call baseisadirs,$(libdir),libwrap\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibwrap0 += $(DESCRIPTION), libwrap.so.0 +RUNTIME_DEP_PKGS_CSWtcpwrap += CSWlibwrap0 + +PACKAGES += CSWtcpwrap-dev +SPKG_DESC_CSWtcpwrap-dev = $(DESCRIPTION) development package +PKGFILES_CSWtcpwrap-dev += $(PKGFILES_DEVEL) +CATALOGNAME_CSWtcpwrap-dev = tcpwrappers_dev + # These binaries link against libwrap.so which will be linked by alternatives # after package install. Until then they can obviously not link properly. CHECKPKG_OVERRIDES = symbol-not-found|tcpdmatch @@ -95,7 +110,7 @@ ginstall -d $(DESTDIR)$(includedir) cd $(WORKSRC) && ginstall -v -m 644 tcpd.h $(DESTDIR)$(includedir) ginstall -d $(DESTDIR)$(libdir) - cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.1 $(DESTDIR)$(libdir)/$(LIBNAME_EXTENDED-$(EXTENDED)) + cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.0 $(DESTDIR)$(libdir)/$(LIBNAME_EXTENDED-$(EXTENDED)) ginstall -d $(DESTDIR)$(mandir)/man3 cd $(WORKSRC) && ginstall -v -m 644 *.3 $(DESTDIR)$(mandir)/man3 ginstall -d $(DESTDIR)$(mandir)/man5 @@ -107,13 +122,13 @@ post-merge: ginstall -d $(PKGROOT)$(dir $(POSTMSG)) ginstall $(WORKDIR)/$(notdir $(POSTMSG)) $(PKGROOT)$(POSTMSG) - ln -s libwrap.so.1 $(PKGROOT)$(libdir)/libwrap.so - ln -s libwrap.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so - @# As libwrap.so.1 is the SONAME to be bound against we must register it with the package + ln -s libwrap.so.0 $(PKGROOT)$(libdir)/libwrap.so + ln -s libwrap.so.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so + @# As libwrap.so.0 is the SONAME to be bound against we must register it with the package @# to allow chkpkg to look up the pkgname for the library. This is rewritten by alternatives @# on installation and is solely to register the link path, the destination doesn't matter. - ln -s /etc/opt/csw/alternatives/tcpwrappers $(PKGROOT)$(libdir)/libwrap.so.1 - ln -s /etc/opt/csw/alternatives/tcpwrappers64 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 + ln -s /etc/opt/csw/alternatives/tcpwrappers $(PKGROOT)$(libdir)/libwrap.so.0 + ln -s /etc/opt/csw/alternatives/tcpwrappers64 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.0 @$(MAKECOOKIE) SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel