From 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
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)
---
cad/magic/Makefile | 6 +++---
cad/magic/files/defs.mak | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'cad/magic')
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 0055457f0539..5b0e758ddece 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -7,16 +7,16 @@
PORTNAME= magic
PORTVERSION= 7.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= cad
MASTER_SITES= http://vlsi.cornell.edu/magic/
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive editor for VLSI layouts
-USE_XLIB= yes
+USE_XORG= x11
USE_GMAKE= yes
-MAKE_ENV= CADDIR="${PREFIX}" X11BASE="${X11BASE}"
+MAKE_ENV= CADDIR="${PREFIX}"
ALL_TARGET= mains
BINS= XHelper7 ext2sim ext2spice extcheck magic magicusage net2ir
diff --git a/cad/magic/files/defs.mak b/cad/magic/files/defs.mak
index fd1f5c37374c..3082889957a4 100644
--- a/cad/magic/files/defs.mak
+++ b/cad/magic/files/defs.mak
@@ -28,9 +28,9 @@ READLINE_LIBS = -lreadline -ltermcap
DEPEND_FLAG = -MM
DEPEND_FILE = Depend
-GR_CFLAGS = -I${X11BASE}/include
+GR_CFLAGS = -I${LOCALBASE}/include
GR_DFLAGS = -DX11 -DXLIB -DX11HELP_PROG=\"${X11HELP_PROG}\"
-GR_LIBS = -L${X11BASE}/lib -lX11
+GR_LIBS = -L${LOCALBASE}/lib -lX11
GR_SRCS = ${X11_SRCS}
GR_HELPER_SRCS = ${X11HELPER_SRCS}
GR_HELPER_PROG = ${X11HELP_PROG}
--
cgit v1.2.3