Index: head/graphics/seom/Makefile =================================================================== --- head/graphics/seom/Makefile (revision 311877) +++ head/graphics/seom/Makefile (revision 311878) @@ -1,62 +1,57 @@ # New ports collection makefile for: seom # Date created: 12th January 2010 # Whom: bms # # $FreeBSD$ # PORTNAME= seom PORTVERSION= 2010011201 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= bms DISTNAME= seom-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Real-time capture library for OpenGL applications NOMAN= defined USE_BZIP2= yes USE_GCC= 4.2+ -USE_GMAKE= yes USE_XORG= x11 xv USE_GL= yes USE_LDCONFIG= yes .include ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than i386 and amd64" - -.if ${ARCH} == "i386" -BROKEN= does not build -.endif .if ${ARCH} == "i386" || ${ARCH} == "amd64" BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm .endif MAKE_JOBS_SAFE= defined MAKE_ENV+= DATADIR="${DATADIR}" PREFIX="${PREFIX}" # # To roll snapshot: as bms: make BOOTSTRAP=defined fetch # .if defined(BOOTSTRAP) FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion SVN_REV= 196 # svn tip at epoch 2009120801 SVNROOT_URI= https://devel.neopsis.com/svn/seom do-fetch: ${MKDIR} ${WRKDIR} svn export -r ${SVN_REV} ${SVNROOT_URI}/trunk ${WRKSRC} cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME} .if ${USER} == bms ${CHMOD} ugo+r ${DISTDIR}/${DISTNAME}.tar.bz2 scp -p ${DISTDIR}/${DISTNAME}.tar.bz2 \ freefall.freebsd.org:public_distfiles/ .endif .endif # defined(BOOTSTRAP) .include Property changes on: head/graphics/seom/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/seom/files/patch-Makefile =================================================================== --- head/graphics/seom/files/patch-Makefile (revision 311877) +++ head/graphics/seom/files/patch-Makefile (revision 311878) @@ -1,53 +1,67 @@ -Index: Makefile -=================================================================== ---- Makefile (revision 196) -+++ Makefile (working copy) -@@ -2,8 +2,11 @@ +--- Makefile 2007-03-27 15:23:25.000000000 -0400 ++++ Makefile 2013-02-07 12:32:37.000000000 -0500 +@@ -1,20 +1,27 @@ ++.SUFFIXES: .c .o .asm + MAJOR = 0 LIBRARY = libseom.so -DESTDIR = +DESTDIR ?= + +# XXX override passed in LIBDIR = lib +LIBDATADIR = libdata CC = gcc ASM = yasm -@@ -11,8 +14,11 @@ - CFLAGS = -Iinclude -std=c99 + +-CFLAGS = -Iinclude -std=c99 ++CFLAGS += -Iinclude -std=c99 LDFLAGS = -Wl,--as-needed -include config.make +###include config.make - ++ +ARCH = C +CFLAGS += -I${LOCALBASE}/include -L${LOCALBASE}/lib -+ + OBJS = src/buffer.o src/client.o src/codec.o src/frame.o src/opengl.o \ - src/server.o src/stream.o src/arch/$(ARCH)/frame.o +- src/server.o src/stream.o src/arch/$(ARCH)/frame.o ++ src/server.o src/stream.o src/arch/${ARCH:S/i386/x86/g}/frame.o -@@ -29,7 +35,7 @@ + APPS = filter player server + playerLIBS = -lX11 -lXv +@@ -22,14 +29,14 @@ + .PHONY: all clean install + all: $(LIBRARY) $(APPS) + +-%.o: %.asm +- $(ASM) -m $(ARCH) -f elf -o $@ $< ++.asm.o: ++ $(ASM) -m ${ARCH:S/i386/x86/g} -f elf -o $@ $< + +-%.o: %.c ++.c.o: $(CC) $(CFLAGS) -fPIC -c -o $@ $< $(LIBRARY): $(OBJS) - $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(MAJOR) -o $@ $(OBJS) -ldl -lpthread + $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(MAJOR) -o $@ $(OBJS) -lpthread $(APPS): $(LIBRARY) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ src/$@/main.c -lseom $($@LIBS) -@@ -39,11 +45,11 @@ +@@ -39,11 +46,11 @@ inst = install -m 755 -d $(DESTDIR)$(3); install -m $(1) $(2) $(DESTDIR)$(3)$(if $(4),/$(4)); install: $(LIBRARY) $(APPS) seom.pc - $(call inst,644,seom.pc,$(PREFIX)/$(LIBDIR)/pkgconfig) + $(call inst,644,seom.pc,$(PREFIX)/$(LIBDATADIR)/pkgconfig) $(call inst,755,$(LIBRARY),$(PREFIX)/$(LIBDIR),$(LIBRARY).$(MAJOR)) ln -sf $(LIBRARY).$(MAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(LIBRARY) - $(call inst,644,art/seom.svg,$(PREFIX)/share/seom,seom.svg) + $(call inst,644,art/seom.svg,$(DATADIR),seom.svg) $(call inst,644,include/seom/*,$(PREFIX)/include/seom) $(call inst,755,src/scripts/backup,$(PREFIX)/bin,seom-backup) $(foreach app,$(APPS),$(call inst,755,$(app),$(PREFIX)/bin,seom-$(app))) Property changes on: head/graphics/seom/files/patch-Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/seom/files/patch-warnings =================================================================== --- head/graphics/seom/files/patch-warnings (nonexistent) +++ head/graphics/seom/files/patch-warnings (revision 311878) @@ -0,0 +1,25 @@ +--- src/stream.c 2007-03-27 15:23:25.000000000 -0400 ++++ src/stream.c 2013-02-07 12:35:18.000000000 -0500 +@@ -43,5 +43,5 @@ + + stream->fd = socket(AF_INET, SOCK_STREAM, 0); +- connect(stream->fd, &addr, sizeof(addr)); ++ connect(stream->fd, (struct sockaddr *)&addr, sizeof(addr)); + } else if (strncmp(spec, "ipv6://", 7) == 0) { + fprintf(stderr, "IPv6 unsupported !\n"); +--- src/server.c 2006-10-17 07:12:15.000000000 -0400 ++++ src/server.c 2013-02-07 12:36:56.000000000 -0500 +@@ -64,5 +64,5 @@ + addr.sin_addr.s_addr = htonl(INADDR_ANY); + +- bind(server->socket, &addr, sizeof(addr)); ++ bind(server->socket, (struct sockaddr *)&addr, sizeof(addr)); + listen(server->socket, 1); + +@@ -80,5 +80,5 @@ + socklen_t len = sizeof(addr); + +- int sockfd = accept(server->socket, &addr, &len); ++ int sockfd = accept(server->socket, (struct sockaddr *)&addr, &len); + if (sockfd < 0) { + return; Property changes on: head/graphics/seom/files/patch-warnings ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property