diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-11-03 11:08:12 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-11-03 11:08:12 +0000 |
| commit | 08882f6b5f70eee50ab61c9dd90ae11553f50039 (patch) | |
| tree | 09ddcba91f677f5406089ee21aca80b0ef40c598 /x11-servers | |
| parent | Fix curses clear() usage. (diff) | |
Change wrapper dependency -- depend on wrapper from XFree86-4-Server. Don't
install server with setuid bit. Various fixed from XFree86-4 port.
Submitted by: taguchi@tohoku.iij.ad.jp (XFree86-4-* maintainer)
Notes
Notes:
svn path=/head/; revision=34721
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 9 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 6 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 9 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/scripts/configure | 6 |
4 files changed, 22 insertions, 8 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index 0901bb8a6d9a..a03b6f6da3a7 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -7,6 +7,7 @@ PORTNAME= Server PORTVERSION= 4.0.1 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -15,6 +16,8 @@ DISTFILES= X401src-1.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp +RUN_DEPENDS= Xwrapper:${PORTSDIR}/x11/wrapper + XFREE86_VERSION= 4 USE_IMAKE= YES DIST_SUBDIR= xc @@ -93,10 +96,14 @@ ExtendedInputDevices?= YES .if !defined(BATCH) && !defined(PACKAGE_BUILDING) pre-everything: - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL +# ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure +post-install: + [ -x ${PREFIX}/bin/Xwrapper ] && ( cd ${PREFIX}/bin ; ${LN} -sf Xwrapper X ) + ${CHMOD} a-s ${PREFIX}/bin/XFree86 + .include <bsd.port.mk> diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index a1d6022f6e85..baf9551c37dd 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -29,9 +29,9 @@ configure () { # It's good for FreeBSD ports/packages system. echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - # I want to set this line. - # but the probrem is too deep. not yet done. - # echo "#define InstallXserverSetUID NO" >> $LOCALDEF + # Now, We can use this configuration. + # Thanks, Trevor Johnson <trevor@jpj.net> + echo "#define InstallXserverSetUID NO" >> $LOCALDEF # disable some configs: there are not used this ports for i in \ diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 0901bb8a6d9a..a03b6f6da3a7 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -7,6 +7,7 @@ PORTNAME= Server PORTVERSION= 4.0.1 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -15,6 +16,8 @@ DISTFILES= X401src-1.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp +RUN_DEPENDS= Xwrapper:${PORTSDIR}/x11/wrapper + XFREE86_VERSION= 4 USE_IMAKE= YES DIST_SUBDIR= xc @@ -93,10 +96,14 @@ ExtendedInputDevices?= YES .if !defined(BATCH) && !defined(PACKAGE_BUILDING) pre-everything: - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL +# ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure +post-install: + [ -x ${PREFIX}/bin/Xwrapper ] && ( cd ${PREFIX}/bin ; ${LN} -sf Xwrapper X ) + ${CHMOD} a-s ${PREFIX}/bin/XFree86 + .include <bsd.port.mk> diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index a1d6022f6e85..baf9551c37dd 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -29,9 +29,9 @@ configure () { # It's good for FreeBSD ports/packages system. echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - # I want to set this line. - # but the probrem is too deep. not yet done. - # echo "#define InstallXserverSetUID NO" >> $LOCALDEF + # Now, We can use this configuration. + # Thanks, Trevor Johnson <trevor@jpj.net> + echo "#define InstallXserverSetUID NO" >> $LOCALDEF # disable some configs: there are not used this ports for i in \ |