From 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 19 Apr 2008 17:56:05 +0000 Subject: - Remove unneeded dependency from gtk12/gtk20 [1] - Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav) --- x11-wm/wm2/Makefile | 6 +++--- x11-wm/wm2/files/patch-aa | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'x11-wm/wm2') diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile index 8ad102ee0c3b..1ce20a00caa6 100644 --- a/x11-wm/wm2/Makefile +++ b/x11-wm/wm2/Makefile @@ -7,7 +7,7 @@ PORTNAME= wm2 PORTVERSION= 4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.all-day-breakfast.com/wm2/ DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -15,9 +15,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= A very simple window manager for X -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend -USE_X_PREFIX= yes +USE_XORG= x11 xext xmu ALL_TARGET= depend wm2 do-install: diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-aa index a9e723ad4b0c..819ef9e6114c 100644 --- a/x11-wm/wm2/files/patch-aa +++ b/x11-wm/wm2/files/patch-aa @@ -3,7 +3,7 @@ @@ -1,9 +1,10 @@ -LIBS = -L/usr/X11/lib -lXext -lX11 -lXmu -lm -+LIBS = -L$(PREFIX)/lib -lXext -lX11 -lXmu -lm ++LIBS = -L$(LOCALBASE)/lib -lXext -lX11 -lXmu -lm +LIBS += -Wl,-rpath,$(PREFIX)/lib -CC = gcc @@ -11,7 +11,7 @@ -CFLAGS = -O2 +CC ?= gcc +CCC = $(CXX) -+CFLAGS += -I$(PREFIX)/include ++CFLAGS += -I$(LOCALBASE)/include OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o .c.o: -- cgit v1.2.3