mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00
Code Issues Releases Activity

- Fix build with new tcl/tk layout.

Browse Source 
PR:             110263
Submitted by:   Martin Matuska <martin@matuska.org>
This commit is contained in:
Martin Wilke 2007-03-13 13:30:55 +00:00
parent 0bb055df81
commit f3dd7df3ad
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=187313
3 changed files with 75 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
misc/dotfile/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= dotfile
PORTVERSION= 2.4.1
PORTREVISION= 1
CATEGORIES= misc tk82
MASTER_SITES= http://www.blackie.dk/dotfile/download/
@ -14,33 +15,26 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A GUI dotfile generator program to create .config files
BUILD_DEPENDS= formail:${PORTSDIR}/mail/procmail
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
.if defined(WITH_JAPANESE)
BUILD_DEPENDS+= wish8.0jp:${PORTSDIR}/japanese/tk80
RUN_DEPENDS+= wish8.0jp:${PORTSDIR}/japanese/tk80
.endif
GNU_CONFIGURE= yes
PLIST_SUB= DISTNAME="${DISTNAME}"
NO_BUILD= yes
.if !defined(BATCH)
IS_INTERACTIVE= yes
.endif
MAN1= dotfile.1
post-patch:
.if defined(BATCH)
OPTIONS= JAPANESE "Use Japanese as default language" off
USE_TK= 82
USE_TK_BUILD= 82
.include <bsd.port.pre.mk>
.if defined(WITH_JAPANESE)
@${REINPLACE_CMD} -e "s|set answer \"\"|set answer \"2\"|" \
${WRKSRC}/language.tcl
.else
@${REINPLACE_CMD} -e "s|set answer \"\"|set answer \"1\"|" \
${WRKSRC}/language.tcl
.endif # WITH_JAPANESE
.endif # BATCH
CONFIGURE_ENV+= LANGUAGE="japanese"
.endif
post-patch:
@${RM} ${WRKSRC}/Modules/english/procmail/configure.orig
@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dotfile
post-configure:
@ -63,4 +57,4 @@ post-install:
@${ECHO_CMD} ""
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

12
misc/dotfile/files/patch-Modules-english-procmail-configure Normal file
View File

@ -0,0 +1,12 @@
--- Modules/english/procmail/configure.orig Sat Feb 19 20:15:42 2000
+++ Modules/english/procmail/configure Tue Mar 13 12:59:19 2007
@@ -533,8 +533,7 @@
echo "----------------------------------------------------------------------"
echo "----------------------------------------------------------------------"
-
-for ac_prog in tclsh7.6 tclsh7.5 tclsh7.4 tclsh
+for ac_prog in tclsh8.2 tclsh8.1 tclsh8.0 tclsh7.6 tclsh7.5 tclsh7.4 tclsh
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2

49
misc/dotfile/files/patch-configure Normal file
View File

@ -0,0 +1,49 @@
--- configure.orig Sat Feb 19 20:15:36 2000
+++ configure Tue Mar 13 12:56:59 2007
@@ -541,7 +541,14 @@
echo "######################################################################"
echo "######################################################################"
-for ac_prog in wish8.2jp wish8.2 wish8.1jp wish8.1 wish8.0jp wish8.0 wish4.2jp wish4.2 wish4.1jp wish4.1 wish4.0jp wish4.0
+#### Which language should TDG use?
+if test "x$LANGUAGE" = "xjapanese" ; then
+ LANGUAGE="japanese";
+else
+ LANGUAGE="english";
+fi
+
+for ac_prog in wish8.2 wish8.1 wish8.0 wish4.2jp wish4.2 wish4.1jp wish4.1 wish4.0jp wish4.0
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -733,7 +740,7 @@
echo "####################################################################"
fi
fi
-for ac_prog in tclsh8.2jp tclsh8.2 tclsh8.1jp tclsh8.1 tclsh8.0jp tclsh8.0 tclsh7.6jp tclsh7.6 tclsh7.5jp tclsh7.5 tclsh7.4jp tclsh7.4 tclsh
+for ac_prog in tclsh8.2 tclsh8.2jp tclsh8.1 tclsh8.0jp tclsh8.0 tclsh7.6jp tclsh7.6 tclsh7.5jp tclsh7.5 tclsh7.4jp tclsh7.4 tclsh
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -1222,18 +1229,12 @@
{ echo "configure: error: I couldn't find 'ln'" 1>&2; exit 1; }
fi
-
#### Which language should TDG use?
-$TCLSH language.tcl
-res=$?
-if test "$res" = "1" ; then
- LANGUAGE=english;
-elif test "$res" = "2" ; then
- LANGUAGE=japanese;
+if test "x$LANGUAGE" = "xjapanese" ; then
+ LANGUAGE="japanese";
else
- { echo "configure: error: Internal error" 1>&2; exit 1; }
+ LANGUAGE="english";
fi
-
trap '' 1 2 15
cat > confcache <<\EOF