diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-10-28 23:11:09 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-10-28 23:11:09 +0000 |
| commit | 01cd481a6fdf6b979706a4ddd27e03cf38d81163 (patch) | |
| tree | bbe49541b91dead93827383201580f7c9560dd8e /x11 | |
| parent | cb910f1e7625dc5ec8a27a4345111297b05f4bc8 (diff) | |
| download | ports-01cd481a6fdf6b979706a4ddd27e03cf38d81163.tar.gz ports-01cd481a6fdf6b979706a4ddd27e03cf38d81163.zip | |
Notes
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4/Makefile | 9 | ||||
| -rw-r--r-- | x11/XFree86-4/files/patch-config_cf_Server_tmpl | 11 | ||||
| -rw-r--r-- | x11/XFree86-4/pkg-message | 5 |
3 files changed, 18 insertions, 7 deletions
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index ca492e679072..25cd93aa7016 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -7,7 +7,7 @@ PORTNAME= XFree86 PORTVERSION= 4.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -56,9 +56,6 @@ pre-fetch: .elif defined(USA_RESIDENT) .if ${USA_RESIDENT} == NO pre-fetch: -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -.endif MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/ @@ -68,9 +65,6 @@ IGNOREFILES= Wraphelp.c .endif .if ${USA_RESIDENT} == YES pre-fetch: -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -.endif @${ECHO} @${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c. .endif @@ -93,6 +87,7 @@ post-install: .ifndef DISTRIB ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .endif + @${CAT} ${PKGMESSAGE} .ifdef DISTRIB distrib: all install diff --git a/x11/XFree86-4/files/patch-config_cf_Server_tmpl b/x11/XFree86-4/files/patch-config_cf_Server_tmpl new file mode 100644 index 000000000000..dde9241e3eda --- /dev/null +++ b/x11/XFree86-4/files/patch-config_cf_Server_tmpl @@ -0,0 +1,11 @@ +--- config/cf/Server.tmpl.orig Fri Feb 18 08:23:07 2000 ++++ config/cf/Server.tmpl Sat Oct 28 10:09:07 2000 +@@ -41,7 +41,7 @@ + #ifndef SetUIDServerTarget + #if InstallServerSetUID + #define SetUIDServerTarget(server,subdirs,objects,libs,syslibs) @@\ +-ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(INSTUIDFLAGS)) ++ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(INSTBINFLAGS)) + #else + #define SetUIDServerTarget ServerTarget + #endif diff --git a/x11/XFree86-4/pkg-message b/x11/XFree86-4/pkg-message new file mode 100644 index 000000000000..ea2e24612085 --- /dev/null +++ b/x11/XFree86-4/pkg-message @@ -0,0 +1,5 @@ +************************************************************************ +* To improve security, the X server is installed without an SUID bit. * +* This is suitable for use with xdm, but not with a startx script. * +* If you need to use a startx script, install the x11/wrapper package. * +************************************************************************ |