Attachment 10325 Details for Bug 20745 – file.diff

[patch] file.diff

file.diff (text/plain), 10.61 KB, created by tkato on 2000-08-21 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-08-21 16:40:01 UTC

Size: 10.61 KB

patch

obsolete

>diff -urN /usr/ports/irc/quirc/Makefile irc/quirc/Makefile
>--- /usr/ports/irc/quirc/Makefile	Wed Jun 21 20:21:02 2000
>+++ irc/quirc/Makefile	Sat Aug 19 10:09:24 2000
>@@ -6,9 +6,10 @@
> #
> 
> PORTNAME=	quirc
>-PORTVERSION=	0.9.79
>+PORTVERSION=	0.9.80
> CATEGORIES=	irc tk82
> MASTER_SITES=	http://patearl.powersurfr.com/quirc/
>+DISTNAME=	${PORTNAME}-0.9.79
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>@@ -16,13 +17,26 @@
> 
> USE_XLIB=	yes
> GNU_CONFIGURE=	yes
>-ALL_TARGET=	all quirc.inst
>+CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -pedantic"
>+CONFIGURE_ARGS=	--with-wish=${PREFIX}/bin/wish8.2 \
>+		--with-tcl-include-dir=${LOCALBASE}/include/tcl8.2 \
>+		--with-tk-include-dir=${LOCALBASE}/include/tk8.2 \
>+		--with-tcl-lib-dir=${LOCALBASE}/lib/tcl8.2 \
>+		--with-tk-lib-dir=${LOCALBASE}/lib/tk8.2 \
>+		--with-tcl-lib=tcl82 \
>+		--with-tk-lib=tk82 \
>+		--with-tcl-version=8.2
> 
>-pre-install:
>-	@${MKDIR} ${PREFIX}/share/doc/quirc/doc
>+PORTDOCS=	AUTHORS ChangeLog FAQ NEWS README doc/color.txt \
>+		doc/nickcomp.txt doc/quedit.txt doc/rfc1459.txt
> 
> post-install:
>-	@${INSTALL_SCRIPT} ${WRKSRC}/quirc.inst ${PREFIX}/bin
>-	@strip ${PREFIX}/bin/quirc
>+#	${INSTALL_SCRIPT} ${WRKSRC}/quirc.inst ${PREFIX}/bin
>+.if !defined(NOPORTDOCS)
>+	@${MKDIR} ${PREFIX}/share/doc/quirc
>+.for file in ${PORTDOCS}
>+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/quirc
>+.endfor
>+.endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/irc/quirc/files/md5 irc/quirc/files/md5
>--- /usr/ports/irc/quirc/files/md5	Mon Aug  2 21:12:06 1999
>+++ irc/quirc/files/md5	Sat Aug 19 09:07:06 2000
>@@ -1 +1 @@
>-MD5 (quirc-0.9.79.tar.gz) = f2af371083fc30700a2277c83a2d7470
>+MD5 (quirc-0.9.79.tar.gz) = 46dc2bd6365a560fcbb785d18d990dd5
>diff -urN /usr/ports/irc/quirc/patches/patch-aa irc/quirc/patches/patch-aa
>--- /usr/ports/irc/quirc/patches/patch-aa	Fri Feb  4 06:14:04 2000
>+++ irc/quirc/patches/patch-aa	Sat Aug 19 09:54:40 2000
>@@ -1,29 +1,11 @@
>---- Makefile.in.orig	Tue Jul 13 08:55:43 1999
>-+++ Makefile.in	Thu Feb  3 14:57:36 2000
>-@@ -73,7 +73,7 @@
>- SUBDIRS = data
>+--- Makefile.in.orig	Sat Aug 19 09:10:37 2000
>++++ Makefile.in	Sat Aug 19 09:54:30 2000
>+@@ -70,7 +70,7 @@
>+ VERSION = @VERSION@
>+ WISH = @WISH@
>  
>- # Main binary targets
>--bin_PROGRAMS = quirc quirc.inst
>-+bin_PROGRAMS = quirc
>- 
>- # Headers
>- quirc_SOURCES = arlib.c dcc.cc network.cc channel.cc echo.cc quirc.cc tcl.cc command.cc server.cc tcltk.cc complete.cc hash.cc support.cc window.cc tags.cc arlib.h complete.h hash.h messages.h query.h support.h arlibcc.h history.h mytcl.h quirc.h tags.h channel.h defines.h illist.h network.h serverdcc.h command.h echo.h llist.h nick.h window.h
>-@@ -95,7 +95,7 @@
>- 
>- # Documentation
>+-SUBDIRS = data doc
>++SUBDIRS = data
>  
>--docdir = $(prefix)/doc/@PACKAGE@
>-+docdir = $(prefix)/share/doc/@PACKAGE@
>- doc_DATA = doc/rfc1459.txt doc/color.txt FAQ AUTHORS COPYING ChangeLog INSTALL NEWS README
>- 
>- # RPM and spec file generation
>-@@ -151,7 +151,7 @@
>- generate_tags_LDADD = $(LDADD)
>- generate_tags_DEPENDENCIES = 
>- generate_tags_LDFLAGS = 
>--CXXFLAGS = @CXXFLAGS@
>-+CXXFLAGS = @CXXFLAGS@ -pedantic
>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>- CXXLD = $(CXX)
>- CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
>+ # Main binary targets
>+ bin_PROGRAMS = quirc
>diff -urN /usr/ports/irc/quirc/patches/patch-ab irc/quirc/patches/patch-ab
>--- /usr/ports/irc/quirc/patches/patch-ab	Mon Nov 29 03:31:41 1999
>+++ irc/quirc/patches/patch-ab	Thu Jan  1 09:00:00 1970
>@@ -1,160 +0,0 @@
>---- configure.orig	Tue Jul 13 01:17:08 1999
>-+++ configure	Thu Nov  4 08:56:16 1999
>-@@ -2690,17 +2690,17 @@
>- 
>- fi
>- if test "$TCL_DONE" = "0"; then
>--  if test "$TCL_VERSION" = "" || test "$TCL_VERSION" = "8.1"; then
>--    ac_safe=`echo "tcl8.1/tcl.h" | sed 'y%./+-%__p_%'`
>--echo $ac_n "checking for tcl8.1/tcl.h""... $ac_c" 1>&6
>--echo "configure:2697: checking for tcl8.1/tcl.h" >&5
>-+  if test "$TCL_VERSION" = "" || test "$TCL_VERSION" = "8.2"; then
>-+    ac_safe=`echo "tcl8.2/tcl.h" | sed 'y%./+-%__p_%'`
>-+echo $ac_n "checking for tcl8.2/tcl.h""... $ac_c" 1>&6
>-+echo "configure:2697: checking for tcl8.2/tcl.h" >&5
>- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
>-   echo $ac_n "(cached) $ac_c" 1>&6
>- else
>-   cat > conftest.$ac_ext <<EOF
>- #line 2702 "configure"
>- #include "confdefs.h"
>--#include <tcl8.1/tcl.h>
>-+#include <tcl8.2/tcl.h>
>- EOF
>- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
>- { (eval echo configure:2707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>-@@ -2719,7 +2719,7 @@
>- fi
>- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
>-   echo "$ac_t""yes" 1>&6
>--  TCL_HEADER=tcl8.1/tcl.h;ADD_TCL=tcl8.1;TCL_DONE=1
>-+  TCL_HEADER=tcl8.2/tcl.h;ADD_TCL=tcl8.2;TCL_DONE=1
>- else
>-   echo "$ac_t""no" 1>&6
>- fi
>-@@ -2842,17 +2842,17 @@
>- 
>- fi
>- if test "$TK_DONE" = "0"; then
>--  if test "$TCL_VERSION" = "" || test "$TCL_VERSION" = "8.1"; then
>--    ac_safe=`echo "tcl8.1/tk.h" | sed 'y%./+-%__p_%'`
>--echo $ac_n "checking for tcl8.1/tk.h""... $ac_c" 1>&6
>--echo "configure:2849: checking for tcl8.1/tk.h" >&5
>-+  if test "$TCL_VERSION" = "" || test "$TCL_VERSION" = "8.2"; then
>-+    ac_safe=`echo "tcl8.2/tk.h" | sed 'y%./+-%__p_%'`
>-+echo $ac_n "checking for tcl8.2/tk.h""... $ac_c" 1>&6
>-+echo "configure:2849: checking for tcl8.2/tk.h" >&5
>- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
>-   echo $ac_n "(cached) $ac_c" 1>&6
>- else
>-   cat > conftest.$ac_ext <<EOF
>- #line 2854 "configure"
>- #include "confdefs.h"
>--#include <tcl8.1/tk.h>
>-+#include <tcl8.2/tk.h>
>- EOF
>- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
>- { (eval echo configure:2859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>-@@ -2871,19 +2871,19 @@
>- fi
>- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
>-   echo "$ac_t""yes" 1>&6
>--  TK_HEADER=tcl8.1/tk.h;TK_DONE=1
>-+  TK_HEADER=tcl8.2/tk.h;TK_DONE=1
>- else
>-   echo "$ac_t""no" 1>&6
>--ac_safe=`echo "tk8.1/tk.h" | sed 'y%./+-%__p_%'`
>--echo $ac_n "checking for tk8.1/tk.h""... $ac_c" 1>&6
>--echo "configure:2880: checking for tk8.1/tk.h" >&5
>-+ac_safe=`echo "tk8.2/tk.h" | sed 'y%./+-%__p_%'`
>-+echo $ac_n "checking for tk8.2/tk.h""... $ac_c" 1>&6
>-+echo "configure:2880: checking for tk8.2/tk.h" >&5
>- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
>-   echo $ac_n "(cached) $ac_c" 1>&6
>- else
>-   cat > conftest.$ac_ext <<EOF
>- #line 2885 "configure"
>- #include "confdefs.h"
>--#include <tk8.1/tk.h>
>-+#include <tk8.2/tk.h>
>- EOF
>- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
>- { (eval echo configure:2890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>-@@ -2902,7 +2902,7 @@
>- fi
>- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
>-   echo "$ac_t""yes" 1>&6
>--  TK_HEADER=tk8.1/tk.h;TK_DONE=1
>-+  TK_HEADER=tk8.2/tk.h;TK_DONE=1
>- else
>-   echo "$ac_t""no" 1>&6
>- fi
>-@@ -2912,7 +2912,7 @@
>-   fi
>- fi
>- if test "$TK_DONE" = "0"; then
>--  if test "$TCL_VERSION" = "" || test "$TCL_VERSION" = "8.1"; then
>-+  if test "$TCL_VERSION" = "" || test "$TCL_VERSION" = "8.2"; then
>-     ac_safe=`echo "tcl8.0/tk.h" | sed 'y%./+-%__p_%'`
>- echo $ac_n "checking for tcl8.0/tk.h""... $ac_c" 1>&6
>- echo "configure:2919: checking for tcl8.0/tk.h" >&5
>-@@ -3045,15 +3045,15 @@
>- 
>- fi
>- if test "$HAVETCL" = "0"; then
>--  if test "$TCL_VERSION" = "" || test "$TCL_VERSION" = "8.1"; then
>--    echo $ac_n "checking for Tcl_Init in -ltcl8.1""... $ac_c" 1>&6
>--echo "configure:3051: checking for Tcl_Init in -ltcl8.1" >&5
>--ac_lib_var=`echo tcl8.1'_'Tcl_Init | sed 'y%./+-%__p_%'`
>-+  if test "$TCL_VERSION" = "" || test "$TCL_VERSION" = "8.2"; then
>-+    echo $ac_n "checking for Tcl_Init in -ltcl82""... $ac_c" 1>&6
>-+echo "configure:3051: checking for Tcl_Init in -ltcl82" >&5
>-+ac_lib_var=`echo tcl8.2'_'Tcl_Init | sed 'y%./+-%__p_%'`
>- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>-   echo $ac_n "(cached) $ac_c" 1>&6
>- else
>-   ac_save_LIBS="$LIBS"
>--LIBS="-ltcl8.1  $LIBS"
>-+LIBS="-ltcl82  $LIBS"
>- cat > conftest.$ac_ext <<EOF
>- #line 3059 "configure"
>- #include "confdefs.h"
>-@@ -3081,7 +3081,7 @@
>- fi
>- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
>-   echo "$ac_t""yes" 1>&6
>--  LIBS="-ltcl8.1 $LIBS"; HAVETCL=1
>-+  LIBS="-ltcl82 $LIBS"; HAVETCL=1
>- else
>-   echo "$ac_t""no" 1>&6
>- echo $ac_n "checking for Tcl_Init in -ltcl81""... $ac_c" 1>&6
>-@@ -3256,15 +3256,15 @@
>- 
>- fi
>- if test "$HAVETK" = "0"; then
>--  if test "$TCL_VERSION" = "" || test "$TCL_VERSION" = "8.1"; then
>--    echo $ac_n "checking for Tk_MainLoop in -ltk8.1""... $ac_c" 1>&6
>--echo "configure:3262: checking for Tk_MainLoop in -ltk8.1" >&5
>--ac_lib_var=`echo tk8.1'_'Tk_MainLoop | sed 'y%./+-%__p_%'`
>-+  if test "$TCL_VERSION" = "" || test "$TCL_VERSION" = "8.2"; then
>-+    echo $ac_n "checking for Tk_MainLoop in -ltk82""... $ac_c" 1>&6
>-+echo "configure:3262: checking for Tk_MainLoop in -ltk82" >&5
>-+ac_lib_var=`echo tk8.2'_'Tk_MainLoop | sed 'y%./+-%__p_%'`
>- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>-   echo $ac_n "(cached) $ac_c" 1>&6
>- else
>-   ac_save_LIBS="$LIBS"
>--LIBS="-ltk8.1  $LIBS"
>-+LIBS="-ltk82  $LIBS"
>- cat > conftest.$ac_ext <<EOF
>- #line 3270 "configure"
>- #include "confdefs.h"
>-@@ -3292,7 +3292,7 @@
>- fi
>- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
>-   echo "$ac_t""yes" 1>&6
>--  LIBS="-ltk8.1 $LIBS"; HAVETK=1
>-+  LIBS="-ltk82 $LIBS"; HAVETK=1
>- else
>-   echo "$ac_t""no" 1>&6
>- echo $ac_n "checking for Tk_MainLoop in -ltk81""... $ac_c" 1>&6
>diff -urN /usr/ports/irc/quirc/pkg/PLIST irc/quirc/pkg/PLIST
>--- /usr/ports/irc/quirc/pkg/PLIST	Mon Aug  2 21:12:08 1999
>+++ irc/quirc/pkg/PLIST	Sat Aug 19 10:17:27 2000
>@@ -1,21 +1,21 @@
> bin/quirc
>-bin/quirc.inst
> share/doc/quirc/AUTHORS
>-share/doc/quirc/COPYING
> share/doc/quirc/ChangeLog
> share/doc/quirc/FAQ
>-share/doc/quirc/INSTALL
> share/doc/quirc/NEWS
> share/doc/quirc/README
>-share/doc/quirc/doc/color.txt
>-share/doc/quirc/doc/rfc1459.txt
>+share/doc/quirc/color.txt
>+share/doc/quirc/nickcomp.txt
>+share/doc/quirc/quedit.txt
>+share/doc/quirc/rfc1459.txt
> share/quirc/VERSION
>-share/quirc/country.tcl
>+share/quirc/common/install.tcl
> share/quirc/dal.tcl
>-share/quirc/default.tcl
>+share/quirc/doc.tcl
>+share/quirc/fontsel
> share/quirc/fun.tcl
> share/quirc/global.tcl
>-share/quirc/killjpq.tcl
>+share/quirc/info.tcl
> share/quirc/listfile.tcl
> share/quirc/mircservers.tcl
> share/quirc/newserver.tcl
>@@ -23,11 +23,12 @@
> share/quirc/popups.tcl
> share/quirc/quedit
> share/quirc/qwidgets.tcl
>+share/quirc/server.tcl
> share/quirc/servers
>-share/quirc/style.tcl
>-share/quirc/translate.tcl
>+share/quirc/themes/default.tcl
> share/quirc/variables.tcl
> share/quirc/winpopup.tcl
>-@dirrm share/doc/quirc/doc
> @dirrm share/doc/quirc
>+@dirrm share/quirc/themes
>+@dirrm share/quirc/common
> @dirrm share/quirc

Actions: View | Diff

Attachments on bug 20745: 10325