diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/gccmakedep/Makefile | 3 | ||||
-rw-r--r-- | devel/gccmakedep/distinfo | 4 | ||||
-rw-r--r-- | devel/gccmakedep/files/patch-gccmdep.cpp | 11 | ||||
-rw-r--r-- | devel/imake/Makefile | 3 | ||||
-rw-r--r-- | devel/imake/distinfo | 4 | ||||
-rw-r--r-- | devel/libpciaccess/Makefile | 3 | ||||
-rw-r--r-- | devel/libpciaccess/distinfo | 4 | ||||
-rw-r--r-- | devel/libpciaccess/files/patch-src-freebsd_pci.c | 38 | ||||
-rw-r--r-- | devel/libpciaccess/files/patch-src-pciaccess_private.h | 6 | ||||
-rw-r--r-- | devel/libpciaccess/pkg-plist | 1 |
10 files changed, 32 insertions, 45 deletions
diff --git a/devel/gccmakedep/Makefile b/devel/gccmakedep/Makefile index 63bf1448eb6c..206b90025506 100644 --- a/devel/gccmakedep/Makefile +++ b/devel/gccmakedep/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gccmakedep -PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTVERSION= 1.0.3 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org diff --git a/devel/gccmakedep/distinfo b/devel/gccmakedep/distinfo index ceb73ede76f1..e4fda9813dac 100644 --- a/devel/gccmakedep/distinfo +++ b/devel/gccmakedep/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/util/gccmakedep-1.0.2.tar.bz2) = 063d49685b1002f3d0b89dfa730e9159f685bd51c277a39fc37b6e377a55ae11 -SIZE (xorg/util/gccmakedep-1.0.2.tar.bz2) = 70490 +SHA256 (xorg/util/gccmakedep-1.0.3.tar.bz2) = b275dcf1f7323ed89e8b36f8fbd5da665d8700005f1779fa5b90a1688bbf2ee4 +SIZE (xorg/util/gccmakedep-1.0.3.tar.bz2) = 104766 diff --git a/devel/gccmakedep/files/patch-gccmdep.cpp b/devel/gccmakedep/files/patch-gccmdep.cpp deleted file mode 100644 index a5d96fdc95a9..000000000000 --- a/devel/gccmakedep/files/patch-gccmdep.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./gccmdep.cpp.orig 2013-06-28 08:58:38.395121863 +0200 -+++ ./gccmdep.cpp 2013-06-28 08:57:53.213147106 +0200 -@@ -9,7 +9,7 @@ - XCOMM - - TMP=mdep$$.tmp --CC=CCCMD -+CC=${CC:-CCCMD} - RM=RMCMD - LN=LNCMD - MV=MVCMD diff --git a/devel/imake/Makefile b/devel/imake/Makefile index e85663078be7..fe04f68743c2 100644 --- a/devel/imake/Makefile +++ b/devel/imake/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= imake -PORTVERSION= 1.0.6 -PORTREVISION= 1 +PORTVERSION= 1.0.7 PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/imake/distinfo b/devel/imake/distinfo index 1ed2131833f1..48c6c3eecccf 100644 --- a/devel/imake/distinfo +++ b/devel/imake/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/util/imake-1.0.6.tar.bz2) = fa8983fdb0a72ba8482d1d2683967fb45c29edd7149b25f619f97ea5a599069d -SIZE (xorg/util/imake-1.0.6.tar.bz2) = 155571 +SHA256 (xorg/util/imake-1.0.7.tar.bz2) = 690c2c4ac1fad2470a5ea73156cf930b8040dc821a0da4e322014a42c045f37e +SIZE (xorg/util/imake-1.0.7.tar.bz2) = 156543 diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile index c65ebb2841a5..5b13434a40c7 100644 --- a/devel/libpciaccess/Makefile +++ b/devel/libpciaccess/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libpciaccess -PORTVERSION= 0.13.2 -PORTREVISION= 2 +PORTVERSION= 0.13.3 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org diff --git a/devel/libpciaccess/distinfo b/devel/libpciaccess/distinfo index fe63f3a388e6..4fca8ae29d39 100644 --- a/devel/libpciaccess/distinfo +++ b/devel/libpciaccess/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libpciaccess-0.13.2.tar.bz2) = abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19 -SIZE (xorg/lib/libpciaccess-0.13.2.tar.bz2) = 359231 +SHA256 (xorg/lib/libpciaccess-0.13.3.tar.bz2) = 6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3 +SIZE (xorg/lib/libpciaccess-0.13.3.tar.bz2) = 368755 diff --git a/devel/libpciaccess/files/patch-src-freebsd_pci.c b/devel/libpciaccess/files/patch-src-freebsd_pci.c index e2fd84651958..d69be780182d 100644 --- a/devel/libpciaccess/files/patch-src-freebsd_pci.c +++ b/devel/libpciaccess/files/patch-src-freebsd_pci.c @@ -1,5 +1,5 @@ ---- src/freebsd_pci.c.orig 2013-08-14 12:31:57.519923558 +0200 -+++ src/freebsd_pci.c 2013-08-14 12:31:36.809923955 +0200 +--- src/freebsd_pci.c.orig 2015-02-03 23:59:14 UTC ++++ src/freebsd_pci.c @@ -39,6 +39,11 @@ #include <unistd.h> #include <fcntl.h> @@ -23,7 +23,7 @@ /** * FreeBSD private pci_system structure that extends the base pci_system * structure. -@@ -105,12 +114,18 @@ +@@ -105,12 +114,18 @@ pci_device_freebsd_map_range(struct pci_ { const int prot = ((map->flags & PCI_DEV_MAP_FLAG_WRITABLE) != 0) ? (PROT_READ | PROT_WRITE) : PROT_READ; @@ -42,7 +42,7 @@ if (fd == -1) return errno; -@@ -120,6 +135,7 @@ +@@ -120,6 +135,7 @@ pci_device_freebsd_map_range(struct pci_ err = errno; } @@ -50,7 +50,7 @@ mrd.mr_base = map->base; mrd.mr_len = map->size; strncpy(mrd.mr_owner, "pciaccess", sizeof(mrd.mr_owner)); -@@ -140,6 +156,7 @@ +@@ -140,6 +156,7 @@ pci_device_freebsd_map_range(struct pci_ } close(fd); @@ -58,7 +58,7 @@ return err; } -@@ -148,6 +165,7 @@ +@@ -148,6 +165,7 @@ static int pci_device_freebsd_unmap_range( struct pci_device *dev, struct pci_device_mapping *map ) { @@ -66,7 +66,7 @@ struct mem_range_desc mrd; struct mem_range_op mro; int fd; -@@ -173,6 +191,7 @@ +@@ -173,6 +191,7 @@ pci_device_freebsd_unmap_range( struct p fprintf(stderr, "Failed to open /dev/mem\n"); } } @@ -74,7 +74,7 @@ return pci_device_generic_unmap_range(dev, map); } -@@ -295,7 +314,11 @@ +@@ -295,7 +314,11 @@ pci_device_freebsd_read_rom( struct pci_ } printf("Using rom_base = 0x%lx\n", (long)rom_base); @@ -86,7 +86,7 @@ if ( memfd == -1 ) return errno; -@@ -308,7 +331,9 @@ +@@ -308,7 +331,9 @@ pci_device_freebsd_read_rom( struct pci_ memcpy( buffer, bios, dev->rom_size ); munmap( bios, dev->rom_size ); @@ -96,7 +96,7 @@ if (pci_rom) { pci_device_cfg_write_u32( dev, PCIR_BIOS, rom ); -@@ -343,7 +368,6 @@ +@@ -343,7 +368,6 @@ pci_device_freebsd_get_num_regions( stru static int pci_device_freebsd_probe( struct pci_device * dev ) { @@ -104,7 +104,7 @@ struct pci_bar_io bar; uint8_t irq; int err, i; -@@ -563,136 +587,152 @@ +@@ -563,138 +587,153 @@ pci_system_freebsd_destroy(void) freebsd_pci_sys = NULL; } @@ -115,7 +115,10 @@ static struct pci_io_handle * -pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret, - struct pci_device *dev, pciaddr_t base, pciaddr_t size) --{ ++pci_device_freebsd_open_legacy_io( struct pci_io_handle *ret, ++ struct pci_device *dev, pciaddr_t base, ++ pciaddr_t size ) + { -#if defined(__i386__) || defined(__amd64__) - ret->fd = open("/dev/io", O_RDWR | O_CLOEXEC); - @@ -124,6 +127,7 @@ - - ret->base = base; - ret->size = size; +- ret->is_legacy = 1; - return ret; -#elif defined(PCI_MAGIC_IO_RANGE) - ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, @@ -133,11 +137,8 @@ - - ret->base = base; - ret->size = size; +- ret->is_legacy = 1; - return ret; -+pci_device_freebsd_open_legacy_io( struct pci_io_handle *ret, -+ struct pci_device *dev, pciaddr_t base, -+ pciaddr_t size ) -+{ +#if defined(__sparc64__) + ret->memory = mmap( NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, + screenfd, base ); @@ -150,6 +151,7 @@ #endif + ret->base = base; + ret->size = size; ++ ret->is_legacy = 1; + return ret; } @@ -333,7 +335,7 @@ } static const struct pci_system_methods freebsd_pci_methods = { -@@ -706,9 +746,7 @@ +@@ -708,9 +747,7 @@ static const struct pci_system_methods f .write = pci_device_freebsd_write, .fill_capabilities = pci_fill_capabilities_generic, .open_legacy_io = pci_device_freebsd_open_legacy_io, @@ -343,7 +345,7 @@ .read32 = pci_device_freebsd_read32, .read16 = pci_device_freebsd_read16, .read8 = pci_device_freebsd_read8, -@@ -790,3 +828,11 @@ +@@ -792,3 +829,11 @@ pci_system_freebsd_create( void ) return 0; } diff --git a/devel/libpciaccess/files/patch-src-pciaccess_private.h b/devel/libpciaccess/files/patch-src-pciaccess_private.h index 2d9cb99c7123..1e0f2c0010d7 100644 --- a/devel/libpciaccess/files/patch-src-pciaccess_private.h +++ b/devel/libpciaccess/files/patch-src-pciaccess_private.h @@ -1,6 +1,6 @@ ---- src/pciaccess_private.h.orig 2008-10-11 18:31:00.000000000 +0000 -+++ src/pciaccess_private.h 2009-03-29 20:07:50.000000000 +0000 -@@ -136,6 +136,7 @@ +--- src/pciaccess_private.h.orig 2015-02-03 23:59:14 UTC ++++ src/pciaccess_private.h +@@ -185,6 +185,7 @@ extern struct pci_system * pci_sys; extern int pci_system_linux_sysfs_create( void ); extern int pci_system_freebsd_create( void ); diff --git a/devel/libpciaccess/pkg-plist b/devel/libpciaccess/pkg-plist index 97c5f03e4d43..1c283a8a1e5f 100644 --- a/devel/libpciaccess/pkg-plist +++ b/devel/libpciaccess/pkg-plist @@ -1,6 +1,5 @@ include/pciaccess.h lib/libpciaccess.a -lib/libpciaccess.la lib/libpciaccess.so lib/libpciaccess.so.0 lib/libpciaccess.so.0.11.1 |