From eeee16a3a9359e493266989c35027a3ea3748146 Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Tue, 12 Aug 2014 13:31:07 +0000 Subject: [PATCH] Stage support --- sysutils/libutempter/Makefile | 1 - sysutils/libutempter/files/patch-Makefile | 21 ++++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/sysutils/libutempter/Makefile b/sysutils/libutempter/Makefile index a88be831d350..1711f8d3cef0 100644 --- a/sysutils/libutempter/Makefile +++ b/sysutils/libutempter/Makefile @@ -13,7 +13,6 @@ COMMENT= Interface to record user sessions to utmp and wtmp files USES= gmake tar:bzip2 USE_LDCONFIG= yes -NO_STAGE= yes .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 900004 diff --git a/sysutils/libutempter/files/patch-Makefile b/sysutils/libutempter/files/patch-Makefile index 380890cda3d2..47025fc6dda0 100644 --- a/sysutils/libutempter/files/patch-Makefile +++ b/sysutils/libutempter/files/patch-Makefile @@ -1,31 +1,30 @@ ---- Makefile.orig 2007-02-19 13:14:08.000000000 +0100 -+++ Makefile 2007-07-17 23:42:11.000000000 +0200 -@@ -30,18 +30,18 @@ +--- Makefile.orig 2007-02-19 12:14:08 UTC ++++ Makefile +@@ -30,9 +30,9 @@ MAP = lib$(PROJECT).map TARGETS = $(PROJECT) $(SHAREDLIB) $(STATICLIB) INSTALL = install -libdir = /usr/lib -libexecdir = /usr/lib -includedir = /usr/include --DESTDIR = -+libdir = /lib -+libexecdir = /libexec -+includedir = /include -+DESTDIR = $(PREFIX) ++libdir = $(PREFIX)/lib ++libexecdir = $(PREFIX)/libexec ++includedir = $(PREFIX)/include + DESTDIR = WARNINGS = -W -Wall -Waggregate-return -Wcast-align -Wconversion \ - -Wdisabled-optimization -Wmissing-declarations \ +@@ -40,8 +40,8 @@ WARNINGS = -W -Wall -Waggregate-return - -Wmissing-format-attribute -Wmissing-noreturn \ -Wmissing-prototypes -Wpointer-arith -Wredundant-decls \ -Wshadow -Wstrict-prototypes -Wwrite-strings -CPPFLAGS = -std=gnu99 $(WARNINGS) -DLIBEXECDIR=\"$(libexecdir)\" -CFLAGS = $(RPM_OPT_FLAGS) +CPPFLAGS = -std=gnu99 $(WARNINGS) -+CFLAGS+= -DLIBEXECDIR=\"$(PREFIX)$(libexecdir)\" ++CFLAGS+= -DLIBEXECDIR=\"$(libexecdir)\" LDLIBS = all: $(TARGETS) -@@ -63,15 +63,20 @@ +@@ -63,15 +63,20 @@ $(STATICLIB): iface.o iface.o: iface.c utempter.h