- Fix if-block in Xresources. [1]

- Fix paths in various scripts. [2]

PR:		ports/117722 [1], ports/117841 [2]
Submitted by:	Warren Block [1], J.R. Oldroyd [2]
This commit is contained in:
Florent Thoumie 2008-01-02 14:16:54 +00:00
parent 682d2ca943
commit 29469d7e69
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=204851
2 changed files with 26 additions and 3 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= xdm
PORTVERSION= 1.1.6
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@ -26,11 +26,13 @@ CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \
post-patch:
@${REINPLACE_CMD} -e "s|XDMCONFIGDIR/|${PREFIX}/lib/X11/xdm/|" \
-e "s|XDMSCRIPTDIR/|${PREFIX}/lib/X11/xdm/|" \
${WRKSRC}/config/xdm-config.cpp
${WRKSRC}/config/xdm-config.cpp \
${WRKSRC}/config/Xstartup.cpp \
${WRKSRC}/config/Xreset.cpp
post-configure:
@${REINPLACE_CMD} -e "s|${EXAMPLESDIR}|${PREFIX}/lib/X11/xdm|" \
${WRKSRC}/config.h
${WRKSRC}/config.h
post-install:
.for f in ${CFFILES}

View file

@ -0,0 +1,21 @@
diff --git a/config/Xresources.cpp b/config/Xresources.cpp
index a98287b..8c04efc 100644
--- config/Xresources.cpp.orig
+++ config/Xresources.cpp
@@ -36,6 +36,16 @@ xlogin*greetFace: Serif-24:bold:italic
xlogin*face: Helvetica-18
xlogin*promptFace: Helvetica-18:bold
xlogin*failFace: Helvetica-18:bold
+XHASHelse
+xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
+xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
+xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
+xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
+xlogin*greetFace: Serif-18:bold:italic
+xlogin*face: Helvetica-12
+xlogin*promptFace: Helvetica-12:bold
+xlogin*failFace: Helvetica-14:bold
+XHASHendif
XHASHifdef COLOR
xlogin*borderWidth: 1