Date: Fri, 5 Dec 2014 09:01:56 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373998 - in head/graphics: . yukon yukon/files Message-ID: <201412050901.sB591u6C088638@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Dec 5 09:01:56 2014 New Revision: 373998 URL: https://svnweb.freebsd.org/changeset/ports/373998 QAT: https://qat.redports.org/buildarchive/r373998/ Log: - Resurrect, unbreak, stagify, modernize Makefile - Define LICENSE (GPLv2), remove -O3 from CFLAGS - Rename (regenerate) one ::-containing patch file - Contract MASTER_SITES, update pkg-plist and pkg-descr Added: head/graphics/yukon/ - copied from r337199, head/graphics/yukon/ head/graphics/yukon/files/patch-include_yukon.h - copied, changed from r337199, head/graphics/yukon/files/patch-include::yukon.h Deleted: head/graphics/yukon/files/patch-include::yukon.h Modified: head/graphics/Makefile head/graphics/yukon/Makefile head/graphics/yukon/files/patch-Makefile head/graphics/yukon/pkg-descr head/graphics/yukon/pkg-plist Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Fri Dec 5 08:36:29 2014 (r373997) +++ head/graphics/Makefile Fri Dec 5 09:01:56 2014 (r373998) @@ -1054,6 +1054,7 @@ SUBDIR += yafray SUBDIR += yagf SUBDIR += yed + SUBDIR += yukon SUBDIR += zathura SUBDIR += zathura-djvu SUBDIR += zathura-pdf-mupdf Modified: head/graphics/yukon/Makefile ============================================================================== --- head/graphics/yukon/Makefile Sun Dec 22 16:32:32 2013 (r337199) +++ head/graphics/yukon/Makefile Fri Dec 5 09:01:56 2014 (r373998) @@ -1,29 +1,22 @@ -# Created by: bms +# Created by: Bruce M Simpson <bms@FreeBSD.org> # $FreeBSD$ PORTNAME= yukon PORTVERSION= 2010011201 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= bms -DISTNAME= yukon-${PORTVERSION} +MASTER_SITES= LOCAL/bms MAINTAINER= ports@FreeBSD.org COMMENT= Real-time capture tool for OpenGL applications -BUILD_DEPENDS= ${LOCALBASE}/include/seom/seom.h:${PORTSDIR}/graphics/seom -LIB_DEPENDS= seom.0:${PORTSDIR}/graphics/seom +LICENSE= GPLv2 -NOMAN= defined +LIB_DEPENDS= libseom.so:${PORTSDIR}/graphics/seom -USE_BZIP2= yes -USE_GCC= 4.2+ -USE_GMAKE= yes +USES= gmake tar:bzip2 USE_XORG= x11 xv -USE_GL= yes +USE_GL= gl USE_LDCONFIG= ${PREFIX}/lib/yukon -NO_STAGE= yes - # NOTE: These should be bumped if the underlying GL or Xorg ports change. LIBGL_MAJOR= 1 @@ -41,7 +34,7 @@ SVN_REV= 158 # svn tip at epoch 2009120 SVNROOT_URI= https://devel.neopsis.com/svn/yukon do-fetch: - ${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKDIR} svn export -r ${SVN_REV} ${SVNROOT_URI}/trunk ${WRKSRC} cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME} .if ${USER} == bms @@ -55,15 +48,13 @@ post-patch: @${REINPLACE_CMD} -e 's,/etc/yukon,${PREFIX}/etc/yukon,' \ ${WRKSRC}/src/core/conf.c ${WRKSRC}/src/scripts/yukon -do-install: - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) - @(${MKDIR} ${PREFIX}/etc/yukon/system) - @(${PRINTF} >> ${TMPDIR}/yukon-system-conf \ - 'LDPATH="%s"\n' ${PREFIX}/lib/yukon) - @(${INSTALL_DATA} ${TMPDIR}/yukon-system-conf \ - ${PREFIX}/etc/yukon/system/default) - @(${INSTALL_DATA} ${WRKSRC}/tools/yukon.conf \ - ${PREFIX}/etc/yukon/conf.sample) +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/yukon/system + @${PRINTF} 'LDPATH="%s"\n' ${PREFIX}/lib/yukon \ + >> ${TMPDIR}/yukon-system-conf + ${INSTALL_DATA} ${TMPDIR}/yukon-system-conf \ + ${STAGEDIR}${PREFIX}/etc/yukon/system/default + ${INSTALL_DATA} ${WRKSRC}/tools/yukon.conf \ + ${STAGEDIR}${PREFIX}/etc/yukon/conf.sample .include <bsd.port.mk> Modified: head/graphics/yukon/files/patch-Makefile ============================================================================== --- head/graphics/yukon/files/patch-Makefile Sun Dec 22 16:32:32 2013 (r337199) +++ head/graphics/yukon/files/patch-Makefile Fri Dec 5 09:01:56 2014 (r373998) @@ -1,16 +1,15 @@ -Index: Makefile -=================================================================== ---- Makefile (revision 158) -+++ Makefile (working copy) +--- Makefile.orig 2007-07-31 17:10:01 UTC ++++ Makefile @@ -1,15 +1,14 @@ DESTDIR = -PREFIX = /usr/local LIBDIR = lib - CC = gcc +-CC = gcc -CFLAGS = -Iinclude -Wall -std=c99 -O3 -+CFLAGS = -I${PWD}/include -Wall -std=c99 -O3 -I$(LOCALBASE)/include -L$(LOCALBASE)/lib ++CC ?= gcc ++CFLAGS = -I${PWD}/include -Wall -std=c99 -I$(LOCALBASE)/include -L$(LOCALBASE)/lib OBJS = src/core/conf.o src/core/glue.o src/core/log.o LIBS = libX11.so libGL.so @@ -20,7 +19,7 @@ Index: Makefile .PHONY: all clean install all: $(LIBS) yukon-core-lib sysconf -@@ -23,20 +22,25 @@ +@@ -23,19 +22,24 @@ $(LIBS): rm -f $@.native yukon-core-lib: $(OBJS) @@ -36,18 +35,17 @@ Index: Makefile install -m 755 -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/$(LIBDIR)/yukon install -m 755 src/scripts/yukon $(DESTDIR)$(PREFIX)/bin install -m 755 yukon-core-lib $(DESTDIR)$(PREFIX)/$(LIBDIR)/yukon +- +- $(foreach lib,$(LIBS),ln -sf /usr/$(LIBDIR)/$(lib) $(DESTDIR)$(PREFIX)/$(LIBDIR)/yukon/$(lib).native;) +- $(foreach lib,$(LIBS),install -m 755 $(lib) $(DESTDIR)$(PREFIX)/$(LIBDIR)/yukon/$(call soname,$(lib));) + ln -sf $(LOCALBASE)/lib/libX11.so.$(LIBX11_MAJOR) \ -+ $(PREFIX)/$(LIBDIR)/yukon/libX11.so.native ++ $(DESTDIR)$(PREFIX)/$(LIBDIR)/yukon/libX11.so.native + ln -sf $(LOCALBASE)/lib/libGL.so.$(LIBGL_MAJOR) \ -+ $(PREFIX)/$(LIBDIR)/yukon/libGL.so.native ++ $(DESTDIR)$(PREFIX)/$(LIBDIR)/yukon/libGL.so.native + install -m 755 libX11.so \ -+ $(PREFIX)/$(LIBDIR)/yukon/libX11.so.$(LIBX11_MAJOR) ++ $(DESTDIR)$(PREFIX)/$(LIBDIR)/yukon/libX11.so.$(LIBX11_MAJOR) + install -m 755 libGL.so \ -+ $(PREFIX)/$(LIBDIR)/yukon/libGL.so.$(LIBGL_MAJOR) ++ $(DESTDIR)$(PREFIX)/$(LIBDIR)/yukon/libGL.so.$(LIBGL_MAJOR) -- $(foreach lib,$(LIBS),ln -sf /usr/$(LIBDIR)/$(lib) $(DESTDIR)$(PREFIX)/$(LIBDIR)/yukon/$(lib).native;) -- $(foreach lib,$(LIBS),install -m 755 $(lib) $(DESTDIR)$(PREFIX)/$(LIBDIR)/yukon/$(call soname,$(lib));) -- clean: rm -f $(OBJS) $(LIBS) yukon-core-lib sysconf - Copied and modified: head/graphics/yukon/files/patch-include_yukon.h (from r337199, head/graphics/yukon/files/patch-include::yukon.h) ============================================================================== --- head/graphics/yukon/files/patch-include::yukon.h Sun Dec 22 16:32:32 2013 (r337199, copy source) +++ head/graphics/yukon/files/patch-include_yukon.h Fri Dec 5 09:01:56 2014 (r373998) @@ -1,7 +1,5 @@ -Index: include/yukon.h -=================================================================== ---- include/yukon.h (revision 158) -+++ include/yukon.h (working copy) +--- include/yukon.h.orig 2007-06-07 13:30:34 UTC ++++ include/yukon.h @@ -2,8 +2,10 @@ #ifndef __YUKON_H__ #define __YUKON_H__ Modified: head/graphics/yukon/pkg-descr ============================================================================== --- head/graphics/yukon/pkg-descr Sun Dec 22 16:32:32 2013 (r337199) +++ head/graphics/yukon/pkg-descr Fri Dec 5 09:01:56 2014 (r373998) @@ -3,4 +3,4 @@ capture realtime videos of OpenGL applic design idea is based on Anandtech's FrameGetter, but was extended to suit today's high-performance computers. -WWW: https://devel.neopsis.com/projects/yukon/ +WWW: https://github.com/wereHamster/yukon Modified: head/graphics/yukon/pkg-plist ============================================================================== --- head/graphics/yukon/pkg-plist Sun Dec 22 16:32:32 2013 (r337199) +++ head/graphics/yukon/pkg-plist Fri Dec 5 09:01:56 2014 (r373998) @@ -1,11 +1,8 @@ bin/yukon -etc/yukon/conf.sample +@sample etc/yukon/conf.sample etc/yukon/system/default lib/yukon/libGL.so.%%LIBGL_MAJOR%% lib/yukon/libGL.so.native lib/yukon/libX11.so.%%LIBX11_MAJOR%% lib/yukon/libX11.so.native lib/yukon/yukon-core-lib -@dirrm etc/yukon/system -@dirrm etc/yukon -@dirrm lib/yukon
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412050901.sB591u6C088638>