aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorNorikatsu Shigemura <nork@FreeBSD.org>2006-08-13 01:49:26 +0000
committerNorikatsu Shigemura <nork@FreeBSD.org>2006-08-13 01:49:26 +0000
commit47b4f76b50599ca26b608072cdccd47e2ee21580 (patch)
tree22b6aaf70daff00b41b804ec761622a73469d10b /x11-servers
parent7ba3aa56337086fa41c4a1837b39a9a5dd930c1e (diff)
downloadports-47b4f76b50599ca26b608072cdccd47e2ee21580.tar.gz
ports-47b4f76b50599ca26b608072cdccd47e2ee21580.zip
Notes
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/synaptics/Makefile4
-rw-r--r--x11-servers/synaptics/distinfo12
-rw-r--r--x11-servers/synaptics/files/patch-Makefile75
3 files changed, 50 insertions, 41 deletions
diff --git a/x11-servers/synaptics/Makefile b/x11-servers/synaptics/Makefile
index 48deeab22967..f5fab0f2353f 100644
--- a/x11-servers/synaptics/Makefile
+++ b/x11-servers/synaptics/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= synaptics
-PORTVERSION= 0.14.4
-PORTREVISION= 2
+PORTVERSION= 0.14.6
+PORTREVISION= 0
CATEGORIES= x11-servers
MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
diff --git a/x11-servers/synaptics/distinfo b/x11-servers/synaptics/distinfo
index cc18b3e33401..c2b2b6e25022 100644
--- a/x11-servers/synaptics/distinfo
+++ b/x11-servers/synaptics/distinfo
@@ -1,12 +1,12 @@
-MD5 (xorg/synaptics-0.14.4.tar.bz2) = ae9aef7a146346fbfc7edfdd63cdd273
-SHA256 (xorg/synaptics-0.14.4.tar.bz2) = 20cdf5884082a4072f45a7f049dfc2b0b8ad9cf24706d741def7f2a09467d43b
-SIZE (xorg/synaptics-0.14.4.tar.bz2) = 125524
+MD5 (xorg/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
+SHA256 (xorg/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
+SIZE (xorg/synaptics-0.14.6.tar.bz2) = 126833
MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
-MD5 (xc/synaptics-0.14.4.tar.bz2) = ae9aef7a146346fbfc7edfdd63cdd273
-SHA256 (xc/synaptics-0.14.4.tar.bz2) = 20cdf5884082a4072f45a7f049dfc2b0b8ad9cf24706d741def7f2a09467d43b
-SIZE (xc/synaptics-0.14.4.tar.bz2) = 125524
+MD5 (xc/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
+SHA256 (xc/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
+SIZE (xc/synaptics-0.14.6.tar.bz2) = 126833
MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb
SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df
SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763
diff --git a/x11-servers/synaptics/files/patch-Makefile b/x11-servers/synaptics/files/patch-Makefile
index 85d7cd33544e..1ae3cbea89ad 100644
--- a/x11-servers/synaptics/files/patch-Makefile
+++ b/x11-servers/synaptics/files/patch-Makefile
@@ -1,13 +1,7 @@
---- Makefile.orig Mon Nov 7 00:29:18 2005
-+++ Makefile Sun Mar 19 03:35:27 2006
-@@ -9,11 +9,11 @@
-
- INSTALLED_X = $(DESTDIR)/usr/X11R6
- LOCAL_X = Xincludes/usr/X11R6
--BINDIR = $(DESTDIR)/usr/local/bin
--MANDIR = $(DESTDIR)/usr/local/man
-+BINDIR = $(DESTDIR)${PREFIX}/bin
-+MANDIR = $(DESTDIR)${PREFIX}/man
+--- Makefile.orig Sun Jul 16 00:58:26 2006
++++ Makefile Sun Aug 13 10:47:35 2006
+@@ -12,14 +12,14 @@
+ MANDIR = $(DESTDIR)$(PREFIX)/man
ifeq ($(ARCH),)
- ARCH = $(shell /bin/arch)
@@ -15,10 +9,27 @@
endif
ifeq ($(ARCH),amd64)
ARCH = x86_64
-@@ -44,12 +44,16 @@
+ endif
+ ifeq ($(ARCH),x86_64)
+ ARCH_DEFINES = -D__x86_64__ -D_XSERVER64
+- LIBDIR = lib64
++ LIBDIR = lib
+ else
+ ARCH_DEFINES = -D__i386__
+ LIBDIR = lib
+@@ -39,7 +39,7 @@
+ -I$(INSTALLED_X)/include/X11/extensions \
+ -I$(SDKDIR)
else
- SERVERSRC = $(TOP)/programs/Xserver
- ALLINCLUDES = -I. \
+- INSTALLED_X = /usr/X11R6
++ INSTALLED_X = ${X11BASE}
+ INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
+ SYNAPTICS_DRV = synaptics_drv.o
+ LDCOMBINEFLAGS = -r
+@@ -62,12 +62,16 @@
+ else
+ SERVERSRC = $(TOP)/programs/Xserver
+ ALLINCLUDES = -I. \
+ -I${X11BASE}/include \
+ -I${X11BASE}/include/X11 \
+ -I$(SERVERSRC)/hw/xfree86 \
@@ -28,36 +39,36 @@
-I$(SERVERSRC)/mi \
-I$(SERVERSRC)/include \
-I$(TOP)/include
-- X_INCLUDES_ROOT = $(TOP)
-+ X_INCLUDES_ROOT = $(X11BASE)
+- X_INCLUDES_ROOT = $(TOP)
++ X_INCLUDES_ROOT = $(X11BASE)
+ endif
endif
- MODULE_DEFINES = -DIN_MODULE -DXFree86Module
-@@ -63,11 +67,11 @@
+@@ -81,11 +85,11 @@
+
CCOPTIONS := -pedantic -Wall -Wpointer-arith
CCOPTIONS += $(call check_gcc,-fno-merge-constants,)
- CCOPTIONS += $(call check_gcc,-fno-pic,)
-CDEBUGFLAGS = -O2
--CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
+-CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
-CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
+#CDEBUGFLAGS = -O2
-+CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
++CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
+CFLAGSCLIENT += $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
-CC = gcc
+#CC = gcc
- LDCOMBINEFLAGS = -r
-
-@@ -78,29 +82,29 @@
+ SRCS = synaptics.c ps2comm.c eventcomm.c psmcomm.c alpscomm.c
+ OBJS = synaptics.o ps2comm.o eventcomm.o psmcomm.o alpscomm.o
+@@ -94,29 +98,29 @@
$(RM) $@
$(CC) -c $(CFLAGS) $(_NOOP_) $*.c
--all:: synaptics_drv.o synclient syndaemon
-+all:: synaptics_drv.o synclient
+-all:: $(SYNAPTICS_DRV) synclient syndaemon
++all:: $(SYNAPTICS_DRV) synclient
--install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o install-man
-+install: $(BINDIR)/synclient $(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o install-man
+-install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man
++install: $(BINDIR)/synclient $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man
-install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5
+install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man5/synaptics.5
@@ -67,8 +78,7 @@
+ ${BSD_INSTALL_MAN} $< $@
$(MANDIR)/man1/syndaemon.1: manpages/syndaemon.1
-- install --mode=0644 -D $< $@
-+ ${BSD_INSTALL_MAN} $< $@
+ install --mode=0644 -D $< $@
$(MANDIR)/man5/synaptics.5: manpages/synaptics.5
- install --mode=0644 -D $< $@
@@ -79,12 +89,11 @@
+ ${BSD_INSTALL_PROGRAM} $< $@
$(BINDIR)/syndaemon : syndaemon
-- install -D $< $@
-+ ${BSD_INSTALL_PROGRAM} $< $@
+ install -D $< $@
- $(INSTALLED_X)/$(LIBDIR)/modules/input/synaptics_drv.o : synaptics_drv.o
+ $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV)
- install --mode=0644 -D $< $@
+ ${BSD_INSTALL_DATA} $< $@
- synaptics_drv.o: $(OBJS)
+ $(SYNAPTICS_DRV): $(OBJS)
$(RM) $@