[csw-devel] SF.net SVN: gar:[18753] csw/mgar/pkg/libnet/branches/1.1.x

[dmichelsen at users.sourceforge.net]

Revision: 18753
          http://gar.svn.sourceforge.net/gar/?rev=18753&view=rev
Author:   dmichelsen
Date:     2012-07-15 21:38:05 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
libnet/branches/1.1.x: Update to 1.1.6

Modified Paths:
--------------
    csw/mgar/pkg/libnet/branches/1.1.x/Makefile
    csw/mgar/pkg/libnet/branches/1.1.x/checksums

Removed Paths:
-------------
    csw/mgar/pkg/libnet/branches/1.1.x/files/libnet.so.1.0.2.i
    csw/mgar/pkg/libnet/branches/1.1.x/files/libnet.so.1.0.2.s

Modified: csw/mgar/pkg/libnet/branches/1.1.x/Makefile
===================================================================
--- csw/mgar/pkg/libnet/branches/1.1.x/Makefile	2012-07-15 21:34:26 UTC (rev 18752)
+++ csw/mgar/pkg/libnet/branches/1.1.x/Makefile	2012-07-15 21:38:05 UTC (rev 18753)
@@ -1,5 +1,5 @@
 NAME = libnet
-VERSION = 1.1.5
+VERSION = 1.1.6
 CATEGORIES = lib
 
 DESCRIPTION = The libnet packet construction library
@@ -17,33 +17,16 @@
 
 SF_PROJ = libnet-dev
 MASTER_SITES = $(SF_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += libnet.so.1.0.2.i
-DISTFILES += libnet.so.1.0.2.s
-PATCHFILES = 0001-Fix-missing-uint-instead-of-u_int.patch
+DISTFILES  = $(DISTNAME).tar.gz
 
 LICENSE = doc/COPYING
 
 VENDOR_URL = http://github.com/sam-github/libnet
 
-PACKAGES += CSWlibnet
-SPKG_DESC_CSWlibnet = Libnet package construction library (legacy), libnet.so
-SPKG_VERSION_CSWlibnet = 1.0.2a
-PKGFILES_CSWlibnet += $(libdir)/libnet.so
-PKGFILES_CSWlibnet += $(libdir)/libnet.so.1.0.2
-
-# These overrides are for the legacy library which should just
-# stay the way it is.
-CHECKPKG_OVERRIDES_CSWlibnet += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libnet.so
-CHECKPKG_OVERRIDES_CSWlibnet += bad-rpath-entry
-CHECKPKG_OVERRIDES_CSWlibnet += shared-lib-pkgname-mismatch|file=opt/csw/lib/libnet.so.1.0.2|soname=libnet.so.1.0.2|pkgname=CSWlibnet|expected=CSWlibnet1-0-2
-CHECKPKG_OVERRIDES_CSWlibnet += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libnet.so
-
 PACKAGES += CSWlibnet1
 SPKG_DESC_CSWlibnet1 = Libnet package construction library, libnet.so.1
 # Explicitly do *not* include libnet.so.1.0.2
-PKGFILES_CSWlibnet1  = $(call baseisadirs,$(libdir),libnet\.so\.1)
-PKGFILES_CSWlibnet1 += $(call baseisadirs,$(libdir),libnet\.so\.1\.6(\.\d+)*)
+PKGFILES_CSWlibnet1  = $(call pkgfiles_lib,libnet.so.1)
 
 PACKAGES += CSWlibnet-dev
 SPKG_DESC_CSWlibnet-dev = Development files for libnet.so.1
@@ -56,26 +39,18 @@
 
 BUILD64 = 1
 
-EXTRA_CONFIGURE_ARGS-32 += LIBNET_CONFIG_LIBS=-L$(libdir)/libnet-new
-EXTRA_CONFIGURE_ARGS-64 += LIBNET_CONFIG_LIBS=-L$(libdir)
-EXTRA_CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS-$(MEMORYMODEL))
-
 include gar/category.mk
 
 post-install-isa-sparcv8:
 	ginstall -d $(DESTDIR)$(libdir)
-	cp $(WORKDIR)/libnet.so.1.0.2.s $(DESTDIR)$(libdir)/libnet.so.1.0.2
-	rm $(DESTDIR)$(libdir)/libnet.so
-	ln -s libnet.so.1.0.2 $(DESTDIR)$(libdir)/libnet.so
 	mkdir $(DESTDIR)$(libdir)/libnet-new
 	ln -s ../libnet.so.1 $(DESTDIR)$(libdir)/libnet-new/libnet.so
+	rm -f $(DESTDIR)$(libdir)/libnet.so
 	@$(MAKECOOKIE)
 
 post-install-isa-i386:
 	ginstall -d $(DESTDIR)$(libdir)
-	cp $(WORKDIR)/libnet.so.1.0.2.i $(DESTDIR)$(libdir)/libnet.so.1.0.2
-	rm $(DESTDIR)$(libdir)/libnet.so
-	ln -s libnet.so.1.0.2 $(DESTDIR)$(libdir)/libnet.so
 	mkdir $(DESTDIR)$(libdir)/libnet-new
 	ln -s ../libnet.so.1 $(DESTDIR)$(libdir)/libnet-new/libnet.so
+	rm -f $(DESTDIR)$(libdir)/libnet.so
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libnet/branches/1.1.x/checksums
===================================================================
--- csw/mgar/pkg/libnet/branches/1.1.x/checksums	2012-07-15 21:34:26 UTC (rev 18752)
+++ csw/mgar/pkg/libnet/branches/1.1.x/checksums	2012-07-15 21:38:05 UTC (rev 18753)
@@ -1 +1 @@
-a9bc1d75a610efcfee200d3e28d8eb8f  libnet-1.1.5.tar.gz
+710296fe424a49344e5fcc0d09e53317  libnet-1.1.6.tar.gz

Deleted: csw/mgar/pkg/libnet/branches/1.1.x/files/libnet.so.1.0.2.i
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/libnet/branches/1.1.x/files/libnet.so.1.0.2.s
===================================================================
(Binary files differ)

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