diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /x11-drivers | |
| parent | Update to version 2.2.6 (diff) | |
- 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)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/synaptics/Makefile | 9 | ||||
| -rw-r--r-- | x11-drivers/synaptics/files/patch-Makefile | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile index 346439f9e97a..b78925ff05b0 100644 --- a/x11-drivers/synaptics/Makefile +++ b/x11-drivers/synaptics/Makefile @@ -7,7 +7,7 @@ PORTNAME= synaptics PORTVERSION= 0.14.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \ @@ -17,12 +17,9 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= nork@FreeBSD.org COMMENT= The Synaptics touchpad X driver -BUILD_DEPENDS= ${X11BASE}/bin/X:${X_SERVER_PORT} -RUN_DEPENDS= ${BUILD_DEPENDS} - +USE_XORG= xorg-server xi xproto USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes .include <bsd.port.pre.mk> @@ -54,7 +51,7 @@ post-extract: .endfor pre-install: - ${MKDIR} ${X11BASE}/lib/xorg/modules/input/ + ${MKDIR} ${LOCALBASE}/lib/xorg/modules/input/ post-install: .if !defined(NOPORTDOCS) diff --git a/x11-drivers/synaptics/files/patch-Makefile b/x11-drivers/synaptics/files/patch-Makefile index f57b5dba5316..58bc8c599b5d 100644 --- a/x11-drivers/synaptics/files/patch-Makefile +++ b/x11-drivers/synaptics/files/patch-Makefile @@ -23,7 +23,7 @@ -I$(SDKDIR) else - INSTALLED_X = /usr/X11R6 -+ INSTALLED_X = ${X11BASE} ++ INSTALLED_X = ${LOCALBASE} INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input SYNAPTICS_DRV = synaptics_drv.o LDCOMBINEFLAGS = -r @@ -31,8 +31,8 @@ else SERVERSRC = $(TOP)/programs/Xserver ALLINCLUDES = -I. \ -+ -I${X11BASE}/include \ -+ -I${X11BASE}/include/X11 \ ++ -I${LOCALBASE}/include \ ++ -I${LOCALBASE}/include/X11 \ + -I$(SERVERSRC)/hw/xfree86 \ -I$(SERVERSRC)/hw/xfree86/common \ -I$(SERVERSRC)/hw/xfree86/os-support \ @@ -41,7 +41,7 @@ -I$(SERVERSRC)/include \ -I$(TOP)/include - X_INCLUDES_ROOT = $(TOP) -+ X_INCLUDES_ROOT = $(X11BASE) ++ X_INCLUDES_ROOT = $(LOCALBASE) endif endif |