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/deskmenu/Makefile | 2 +- x11/deskmenu/files/patch-Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'x11/deskmenu') diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile index e11e1fba7b64..fc62165f6bce 100644 --- a/x11/deskmenu/Makefile +++ b/x11/deskmenu/Makefile @@ -20,6 +20,6 @@ USE_GNOME= gtk12 USE_GMAKE= yes post-install: - ${STRIP_CMD} ${X11BASE}/bin/deskmenu + ${STRIP_CMD} ${PREFIX}/bin/deskmenu .include diff --git a/x11/deskmenu/files/patch-Makefile b/x11/deskmenu/files/patch-Makefile index 3f3804f39a25..573a7cf09ff9 100644 --- a/x11/deskmenu/files/patch-Makefile +++ b/x11/deskmenu/files/patch-Makefile @@ -5,7 +5,7 @@ -CFLAGS = -g -O2 -Wall `gtk-config --cflags` -XROOT = /usr/X11 +CFLAGS = -g -O2 -Wall `gtk12-config --cflags` -+XROOT = ${X11BASE} ++XROOT = ${LOCALBASE} INCLUDES = -I$(XROOT)/include -LIBS = -lX11 `gtk-config --libs` +LIBS = -lX11 `gtk12-config --libs` -- cgit v1.2.3