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) --- games/xdesktopwaves/Makefile | 8 +++----- games/xdesktopwaves/files/patch-makefile | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'games/xdesktopwaves') diff --git a/games/xdesktopwaves/Makefile b/games/xdesktopwaves/Makefile index dc24ca25963a..f1976b757040 100644 --- a/games/xdesktopwaves/Makefile +++ b/games/xdesktopwaves/Makefile @@ -7,17 +7,15 @@ PORTNAME= xdesktopwaves PORTVERSION= 1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Simulation of water waves on the desktop -USE_X_PREFIX= yes - MAN1= xdesktopwaves.1 +USE_XORG= x11 xext PLIST_FILES= bin/xdesktopwaves diff --git a/games/xdesktopwaves/files/patch-makefile b/games/xdesktopwaves/files/patch-makefile index ab57a74ad54d..a4eacbc64b0f 100644 --- a/games/xdesktopwaves/files/patch-makefile +++ b/games/xdesktopwaves/files/patch-makefile @@ -7,22 +7,22 @@ -CC = gcc -CFLAGS = -I/usr/X11R6/include -O2 +#CC = gcc -+CFLAGS += -I$(X11BASE)/include ++CFLAGS += -I$(LOCALBASE)/include #============================= Linker configuration ============================ -LINK = gcc -LFLAGS = -L/usr/X11R6/lib +LINK = $(CC) -+LFLAGS = -L$(X11BASE)/lib ++LFLAGS = -L$(LOCALBASE)/lib LIBS = -lm -lX11 -lXext #============================ Installer configuration ========================== -BINDIR = /usr/X11R6/bin -MAN1DIR = /usr/X11R6/man/man1 -+BINDIR = $(X11BASE)/bin -+MAN1DIR = $(X11BASE)/man/man1 ++BINDIR = $(LOCALBASE)/bin ++MAN1DIR = $(LOCALBASE)/man/man1 INSTALL = install RM = rm -f -v -- cgit v1.2.3