head	1.3;
access;
symbols
	pkgsrc-2016Q4:1.2.0.22
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.20
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.18
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.16
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.14
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.12
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.10
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.8
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.6
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.4
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.2
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.1.0.10
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.8
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.6
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.4
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2016.12.29.19.13.03;	author wiz;	state dead;
branches;
next	1.2;
commitid	kFYPk8EnajcmFUzz;

1.2
date	2014.05.14.20.22.41;	author bouyer;	state Exp;
branches;
next	1.1;
commitid	7ea8CfKi54N5UxAx;

1.1
date	2013.04.11.19.57.53;	author joerg;	state Exp;
branches
	1.1.2.1
	1.1.10.1;
next	;

1.1.2.1
date	2013.04.11.19.57.53;	author tron;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2013.04.24.21.11.06;	author tron;	state Exp;
branches;
next	;

1.1.10.1
date	2014.05.21.04.06.03;	author schnoebe;	state Exp;
branches;
next	;
commitid	vxhqphifmczvhmBx;


desc
@@


1.3
log
@Remove xenkernel and tools versions 3, 33, and 41.

As discussed on pkgsrc-users.
@
text
@$NetBSD: patch-xenstat_libxenstat_Makefile,v 1.2 2014/05/14 20:22:41 bouyer Exp $

--- xenstat/libxenstat/Makefile.orig	2013-03-25 19:37:42.000000000 +0000
+++ xenstat/libxenstat/Makefile
@@@@ -40,7 +40,7 @@@@
 LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
 LDLIBS-y = -lxenstore -lxenctrl
 LDLIBS-$(CONFIG_SunOS) += -lkstat
-ARLIBS-y = $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so
+ARLIBS-y =
 ARLIBS-x86_64 = /usr/lib/amd64/libkstat.so
 ARLIBS-x86_32 = /usr/lib/libkstat.so
 ARLIBS-$(CONFIG_SunOS) += $(ARLIBS-$(XEN_TARGET_ARCH))
@@@@ -57,13 +57,13 @@@@
 	    $(OBJECTS-y) $(LDLIBS-y)
 
 src/xenstat.o: src/xenstat.c src/xenstat.h src/xenstat_priv.h
-	$(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@@ $<
+	$(CC) $(WARN_FLAGS) $(CFLAGS) -c -o $@@ $<
 
 src/xenstat_linux.o: src/xenstat_linux.c src/xenstat_priv.h
-	$(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@@ $<
+	$(CC) $(WARN_FLAGS) $(CFLAGS) -c -o $@@ $<
 
 src/xenstat_solaris.o: src/xenstat_solaris.c src/xenstat_priv.h
-	$(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@@ $<
+	$(CC) $(WARN_FLAGS) $(CFLAGS) -c -o $@@ $<
 
 src/libxenstat.so.$(MAJOR): $(LIB)
 	$(MAKE_LINK) $(<F) $@@
@


1.2
log
@Make it build on netbsd-6 (and maybe netbsd-5):
Don't include other libraries in an archive, our ar seems to not
support it. Instead, list all libraries at link time.
@
text
@d1 1
a1 1
$NetBSD: patch-xenstat_libxenstat_Makefile,v 1.1 2013/04/11 19:57:53 joerg Exp $
@


1.1
log
@Allow building Xen infrastructure with Clang. Fix various bugs in
xenkernel3, xenkernel41, xentools3 and xentools41 exposed by Clang
default warnings. Bump revisions for those.
@
text
@d1 1
a1 1
$NetBSD$
d5 10
a14 1
@@@@ -57,13 +57,13 @@@@ $(SHLIB): $(OBJECTS-y)
@


1.1.10.1
log
@Pullup ticket #4412 - requested by bouer
sysutils/xentools41: Fix build on NetBSD 6.x and NetBSD 5.x

Revisions pulled up:
- sysutils/xentools41/distinfo                                  1.36
- sysutils/xentools41/patches/patch-xenstat_libxenstat_Makefile 1.2
- sysutils/xentools41/patches/patch-xenstat_xentop_Makefile     1.1

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Wed May 14 20:22:41 UTC 2014

   Modified Files:
   	pkgsrc/sysutils/xentools41: distinfo
   	pkgsrc/sysutils/xentools41/patches: patch-xenstat_libxenstat_Makefile
   Added Files:
   	pkgsrc/sysutils/xentools41/patches: patch-xenstat_xentop_Makefile

   Log Message:
   Make it build on netbsd-6 (and maybe netbsd-5):
   Don't include other libraries in an archive, our ar seems to not
   support it. Instead, list all libraries at link time.
@
text
@d5 1
a5 10
@@@@ -40,7 +40,7 @@@@
 LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
 LDLIBS-y = -lxenstore -lxenctrl
 LDLIBS-$(CONFIG_SunOS) += -lkstat
-ARLIBS-y = $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so
+ARLIBS-y =
 ARLIBS-x86_64 = /usr/lib/amd64/libkstat.so
 ARLIBS-x86_32 = /usr/lib/libkstat.so
 ARLIBS-$(CONFIG_SunOS) += $(ARLIBS-$(XEN_TARGET_ARCH))
@@@@ -57,13 +57,13 @@@@
@


1.1.2.1
log
@file patch-xenstat_libxenstat_Makefile was added on branch pkgsrc-2013Q1 on 2013-04-24 21:11:06 +0000
@
text
@d1 21
@


1.1.2.2
log
@Pullup ticket #4124 - requested by bouyer
sysutils/xentools41: security patch

Revisions pulled up:
- sysutils/xentools41/Makefile                                  1.30-1.31
- sysutils/xentools41/distinfo                                  1.27-1.28
- sysutils/xentools41/patches/patch-.._.._ipxe_src_arch_i386_include_librm.h 1.1
- sysutils/xentools41/patches/patch-.._.._ipxe_src_core_settings.c 1.1
- sysutils/xentools41/patches/patch-.._.._ipxe_src_net_tls.c    1.1
- sysutils/xentools41/patches/patch-.._Config.mk                1.1
- sysutils/xentools41/patches/patch-CVE-2013-0215-1             1.1
- sysutils/xentools41/patches/patch-CVE-2013-0215-2             1.1
- sysutils/xentools41/patches/patch-firmware_hvmloader_Makefile 1.1
- sysutils/xentools41/patches/patch-libcx_xc__dom__boot.c       1.1
- sysutils/xentools41/patches/patch-xenstat_libxenstat_Makefile 1.1

---
   Module Name:    pkgsrc
   Committed By:   joerg
   Date:           Thu Apr 11 19:57:53 UTC 2013

   Modified Files:
           pkgsrc/sysutils/xenkernel3: Makefile distinfo
           pkgsrc/sysutils/xenkernel3/patches: patch-cw
           pkgsrc/sysutils/xenkernel33: Makefile distinfo
           pkgsrc/sysutils/xenkernel41: Makefile distinfo
           pkgsrc/sysutils/xentools3: Makefile distinfo
           pkgsrc/sysutils/xentools3-hvm: Makefile distinfo
           pkgsrc/sysutils/xentools3/patches: patch-.._patch-Config.mk patch-cg
           pkgsrc/sysutils/xentools33: Makefile distinfo
           pkgsrc/sysutils/xentools33/patches: patch-ab
           pkgsrc/sysutils/xentools41: Makefile distinfo
   Added Files:
           pkgsrc/sysutils/xenkernel3/patches: patch-xen_arch_x86_hvm_io.c
               patch-xen_arch_x86_string.c
           pkgsrc/sysutils/xenkernel33/patches: patch-Config.mk patch-xen_Makefile
               patch-xen_arch_x86_Rules.mk
           pkgsrc/sysutils/xenkernel41/patches: patch-Config.mk patch-xen_Makefile
               patch-xen_arch_x86_Rules.mk patch-xen_arch_x86_cpu_mcheck_vmce.c
               patch-xen_arch_x86_time.c
           pkgsrc/sysutils/xentools3-hvm/patches: patch-.._patch-Config.mk
           pkgsrc/sysutils/xentools3/patches: patch-libxc_xc__dom__x86.c
           pkgsrc/sysutils/xentools33/patches: patch-blktap_drivers_block-qcow.c
               patch-ioemu_block-vvfat.c
           pkgsrc/sysutils/xentools41/patches:
               patch-.._.._ipxe_src_arch_i386_include_librm.h
               patch-.._.._ipxe_src_core_settings.c patch-.._.._ipxe_src_net_tls.c
               patch-.._Config.mk patch-firmware_hvmloader_Makefile
               patch-libcx_xc__dom__boot.c patch-xenstat_libxenstat_Makefile

   Log Message:
   Allow building Xen infrastructure with Clang. Fix various bugs in
   xenkernel3, xenkernel41, xentools3 and xentools41 exposed by Clang
   default warnings. Bump revisions for those.

---
   Module Name:    pkgsrc
   Committed By:   bouyer
   Date:           Fri Apr 19 14:03:52 UTC 2013

   Modified Files:
           pkgsrc/sysutils/xentools41: Makefile distinfo
   Added Files:
           pkgsrc/sysutils/xentools41/patches: patch-CVE-2013-0215-1
               patch-CVE-2013-0215-2

   Log Message:
   Add patch from Xen security advisory:
   http://lists.xen.org/archives/html/xen-announce/2013-02/msg00005.html
@
text
@a0 21
$NetBSD$

--- xenstat/libxenstat/Makefile.orig	2013-03-25 19:37:42.000000000 +0000
+++ xenstat/libxenstat/Makefile
@@@@ -57,13 +57,13 @@@@ $(SHLIB): $(OBJECTS-y)
 	    $(OBJECTS-y) $(LDLIBS-y)
 
 src/xenstat.o: src/xenstat.c src/xenstat.h src/xenstat_priv.h
-	$(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@@ $<
+	$(CC) $(WARN_FLAGS) $(CFLAGS) -c -o $@@ $<
 
 src/xenstat_linux.o: src/xenstat_linux.c src/xenstat_priv.h
-	$(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@@ $<
+	$(CC) $(WARN_FLAGS) $(CFLAGS) -c -o $@@ $<
 
 src/xenstat_solaris.o: src/xenstat_solaris.c src/xenstat_priv.h
-	$(CC) $(CFLAGS) $(WARN_FLAGS) -c -o $@@ $<
+	$(CC) $(WARN_FLAGS) $(CFLAGS) -c -o $@@ $<
 
 src/libxenstat.so.$(MAJOR): $(LIB)
 	$(MAKE_LINK) $(<F) $@@
@