svn commit: r304583 - in head/misc/dotfile: . files
Beat Gaetzi
beat at FreeBSD.org
Thu Sep 20 14:44:14 UTC 2012
Author: beat
Date: Thu Sep 20 14:44:13 2012
New Revision: 304583
URL: http://svn.freebsd.org/changeset/ports/304583
Log:
- Fix with Tcl/Tk > 8.2 [1]
- Convert to OptionsNG
- Drop maintainership
PR: ports/171612 [1]
Submitted by: gahr [1]
Added:
head/misc/dotfile/files/patch-Generator_types.tcl (contents, props changed)
Deleted:
head/misc/dotfile/files/patch-af
Modified:
head/misc/dotfile/Makefile
head/misc/dotfile/files/patch-Modules-english-procmail-configure
head/misc/dotfile/files/patch-ag
head/misc/dotfile/files/patch-configure
head/misc/dotfile/pkg-plist
Modified: head/misc/dotfile/Makefile
==============================================================================
--- head/misc/dotfile/Makefile Thu Sep 20 14:38:19 2012 (r304582)
+++ head/misc/dotfile/Makefile Thu Sep 20 14:44:13 2012 (r304583)
@@ -11,7 +11,7 @@ PORTREVISION= 2
CATEGORIES= misc tk
MASTER_SITES= http://www.blackie.dk/dotfile/download/
-MAINTAINER= beat at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= A GUI dotfile generator program to create .config files
BUILD_DEPENDS= formail:${PORTSDIR}/mail/procmail
@@ -22,20 +22,22 @@ NO_BUILD= yes
MAN1= dotfile.1
-OPTIONS= JAPANESE "Use Japanese as default language" off
+OPTIONS_DEFINE= JAPANESE
+JAPANESE_DESC= Use Japanese as default language
-USE_TK= 82
-USE_TK_BUILD= 82
+USE_TK= yes
.include <bsd.port.pre.mk>
-.if defined(WITH_JAPANESE)
+.if ${PORT_OPTIONS:MJAPANESE}
CONFIGURE_ENV+= LANGUAGE="japanese"
.endif
post-patch:
- @${RM} ${WRKSRC}/Modules/english/procmail/configure.orig
- @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dotfile
+ @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; s|%%WISH%%|wish${TK_VER}|g; \
+ s|%%TCLSH%%|tclsh${TCL_VER}|g" ${WRKSRC}/${CONFIGURE_SCRIPT} \
+ ${WRKSRC}/Generator/makeHelp ${WRKSRC}/Modules/english/procmail/${CONFIGURE_SCRIPT}
+ ${FIND} ${WRKSRC} \( -name "*.orig" -o -name "*.bak" \) -delete
post-configure:
@(cd ${WRKSRC}/Modules/english/procmail && CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \
@@ -43,6 +45,9 @@ post-configure:
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
+do-install:
+ cd ${WRKSRC} && ${SETENV} LC_ALL=C ${MAKE} install
+
post-install:
.ifndef(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/dotfile
Added: head/misc/dotfile/files/patch-Generator_types.tcl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/dotfile/files/patch-Generator_types.tcl Thu Sep 20 14:44:13 2012 (r304583)
@@ -0,0 +1,13 @@
+--- Generator/types.tcl.orig 2012-09-13 17:01:08.000000000 +0200
++++ Generator/types.tcl 2012-09-13 17:01:48.000000000 +0200
+@@ -1540,7 +1540,9 @@
+ }
+ }
+ line -
+- header {} ;# please ignore.
++ header {
++ ;# please ignore.
++ }
+ default {
+ warning "setVariable: unknow widget type: \"$type\""
+ }
Modified: head/misc/dotfile/files/patch-Modules-english-procmail-configure
==============================================================================
--- head/misc/dotfile/files/patch-Modules-english-procmail-configure Thu Sep 20 14:38:19 2012 (r304582)
+++ head/misc/dotfile/files/patch-Modules-english-procmail-configure Thu Sep 20 14:44:13 2012 (r304583)
@@ -1,12 +1,11 @@
---- 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 "----------------------------------------------------------------------"
+--- Modules/english/procmail/configure.orig 2012-09-18 19:44:28.000000000 +0200
++++ Modules/english/procmail/configure 2012-09-18 19:44:42.000000000 +0200
+@@ -534,7 +534,7 @@
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
++for ac_prog in %%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
Modified: head/misc/dotfile/files/patch-ag
==============================================================================
--- head/misc/dotfile/files/patch-ag Thu Sep 20 14:38:19 2012 (r304582)
+++ head/misc/dotfile/files/patch-ag Thu Sep 20 14:44:13 2012 (r304583)
@@ -5,4 +5,4 @@
echo "\n\n<h1>---------------</h1>" >> helpfile.data
cat $2 >> helpfile.data
-wish $1/makeHelp.tcl helpfile.data generatedHelp $1
-+wish8.2 $1/makeHelp.tcl helpfile.data generatedHelp $1
++%%WISH%% $1/makeHelp.tcl helpfile.data generatedHelp $1
Modified: head/misc/dotfile/files/patch-configure
==============================================================================
--- head/misc/dotfile/files/patch-configure Thu Sep 20 14:38:19 2012 (r304582)
+++ head/misc/dotfile/files/patch-configure Thu Sep 20 14:44:13 2012 (r304583)
@@ -12,7 +12,16 @@
+ 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
++for ac_prog in %%WISH%%
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -679,7 +686,7 @@
+
+
+ if test "$WISH" = ""; then
+- 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 wish
++ for ac_prog in %%WISH%%
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -21,7 +30,7 @@
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
++for ac_prog in %%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
Modified: head/misc/dotfile/pkg-plist
==============================================================================
--- head/misc/dotfile/pkg-plist Thu Sep 20 14:38:19 2012 (r304582)
+++ head/misc/dotfile/pkg-plist Thu Sep 20 14:44:13 2012 (r304583)
@@ -42,7 +42,6 @@ lib/%%DISTNAME%%/Generator/language.tcl
lib/%%DISTNAME%%/Generator/load.tcl
lib/%%DISTNAME%%/Generator/mail.tcl
lib/%%DISTNAME%%/Generator/makeHelp
-lib/%%DISTNAME%%/Generator/makeHelp.orig
lib/%%DISTNAME%%/Generator/makeHelp.tcl
lib/%%DISTNAME%%/Generator/menus.tcl
lib/%%DISTNAME%%/Generator/parse.tcl
More information about the svn-ports-all
mailing list