Date: Mon, 23 Jun 2014 08:32:49 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358903 - in head/net/gkrellmwireless2: . files Message-ID: <201406230832.s5N8WnZ5095465@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Mon Jun 23 08:32:49 2014 New Revision: 358903 URL: http://svnweb.freebsd.org/changeset/ports/358903 QAT: https://qat.redports.org/buildarchive/r358903/ Log: Stagify. Approved by: portmgr@ Added: head/net/gkrellmwireless2/files/patch-Makefile (contents, props changed) Deleted: head/net/gkrellmwireless2/files/patch-aa Modified: head/net/gkrellmwireless2/Makefile Modified: head/net/gkrellmwireless2/Makefile ============================================================================== --- head/net/gkrellmwireless2/Makefile Mon Jun 23 08:01:51 2014 (r358902) +++ head/net/gkrellmwireless2/Makefile Mon Jun 23 08:32:49 2014 (r358903) @@ -14,9 +14,10 @@ BUILD_DEPENDS= ${LOCALBASE}/include/gkre RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 WRKSRC= ${WRKDIR}/gkrellmwireless - USE_XORG= x11 USES= gmake pkgconfig -NO_STAGE= yes +pre-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins + .include <bsd.port.mk> Added: head/net/gkrellmwireless2/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gkrellmwireless2/files/patch-Makefile Mon Jun 23 08:32:49 2014 (r358903) @@ -0,0 +1,50 @@ +--- Makefile.orig 2002-12-06 23:01:13.000000000 +0800 ++++ Makefile 2014-06-23 16:05:37.848876850 +0800 +@@ -1,33 +1,23 @@ + # Depends on gmake.. + # +-OS = $(shell uname) +- +-ifeq ($(OS),FreeBSD) +- GTK_CONFIG = pkg-config gtk+-2.0 +- INCLUDE = -I/usr/src/sys +-elseif eq ($(OS),NetBSD) +- GTK_CONFIG = pkg-config gtk+-2.0 +-else +-# default to the linux +- GTK_CONFIG = pkg-config gtk+-2.0 +-endif + ++GTK_CONFIG = pkg-config gtk+-2.0 + + GTK_CFLAGS = `$(GTK_CONFIG) --cflags` + GTK_LIB = `$(GTK_CONFIG) --libs` + +-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) ++CFLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) + LIBS = $(GTK_LIB) + LFLAGS = -shared + +-CC = gcc $(CFLAGS) $(FLAGS) ++CC ?= gcc $(CFLAGS) $(FLAGS) + + OBJS = wireless.o + +-PLUGIN_DIR = /usr/lib/gkrellm2/plugins ++PLUGIN_DIR = ${PREFIX}/libexec/gkrellm2/plugins + +-INSTALL = install -c +-INSTALL_PROGRAM = $(INSTALL) -s ++INSTALL = install -c -s ++INSTALL_PROGRAM = $(INSTALL) + + all: wireless.so + +@@ -38,6 +28,6 @@ clean: + rm -f *.o core *.so* *.bak *~ + + install : +- $(INSTALL) $(INSTALL_PERMS) wireless.so $(PLUGIN_DIR) ++ $(INSTALL) $(INSTALL_PERMS) wireless.so $(DESTDIR)$(PLUGIN_DIR) + wireless.o: wireless.c +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406230832.s5N8WnZ5095465>