cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update textproc/xxdiff to 1.10.0. Submitted by maintainer.

Browse Source
This commit is contained in:
lebel 2001-05-25 17:02:01 +00:00
parent 9023210696
commit a295f9e310
9 changed files with 59 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
textproc/xxdiff/Makefile
View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.4 2001/04/19 13:08:33 lebel Exp $
# $OpenBSD: Makefile,v 1.5 2001/05/25 17:02:01 lebel Exp $
COMMENT= "graphical file comparator and merge tool"
DISTNAME= xxdiff-1.9.1
DISTNAME= xxdiff-1.10.0
CATEGORIES= textproc x11
NEED_VERSION= 1.396
NEED_VERSION= 1.413
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xxdiff
HOMEPAGE= http://xxdiff.sourceforge.net/
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= Dan Weeks <danimal@danimal.org>
PERMIT_PACKAGE_CDROM= Yes
@ -30,18 +28,15 @@ SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= QTDIR="${LOCALBASE}" \
USER_LDFLAGS="-L${LOCALBASE}/lib/qt2 -L${LOCALBASE}/lib/X11" \
USER_INCLUDES="-I${LOCALBASE}/include/X11/qt2 -I${LOCALBASE}/include/X11 " \
USER_LDFLAGS="-L${LOCALBASE}/lib/qt2 -L${LOCALBASE}/lib/X11 -L${LOCALBASE}/lib" \
USER_INCLUDES="-I${LOCALBASE}/include/X11/qt2 -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include" \
MOC="${LOCALBASE}/bin/moc2"
MAKE_ENV= ${CONFIGURE_ENV}
MAKE_FLAGS= CXXLD='${CXX} -L${LOCALBASE}/lib/qt2'
WRKSRC= ${WRKDIST}/xxdiff
post-extract:
@rm -r ${WRKSRC}/diffutils-2.7
@rm -r ${WRKDIST}/doc
@rm -r ${WRKDIST}/src
@rm -r ${WRKDIST}/CVS
post-patch:
@perl ${WRKSRC}/automoc -v
.include <bsd.port.mk>

6
textproc/xxdiff/files/md5
View File

@ -1,3 +1,3 @@
MD5 (xxdiff-1.9.1.src.tar.gz) = 6168d86bbc90a483ea03ea5896b42bfd
RMD160 (xxdiff-1.9.1.src.tar.gz) = 8db9c8c02b8545f608aa9e1c753b489b63317498
SHA1 (xxdiff-1.9.1.src.tar.gz) = 0cbcd85d0868496fdb111baf80104686fd213382
MD5 (xxdiff-1.10.0.tar.gz) = 927276168092a5a0ca69aa8e062703e9
RMD160 (xxdiff-1.10.0.tar.gz) = 88db3971a98d131b2b737bc2f94756c6f57d4809
SHA1 (xxdiff-1.10.0.tar.gz) = ea14d17b57bf5275f445b169c18f4a11359f44ab

21
textproc/xxdiff/patches/patch-ltconfig
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-ltconfig,v 1.1.1.1 2001/03/20 14:29:32 wilfried Exp $
--- xxdiff/ltconfig.orig Sun Mar 11 02:07:30 2001
+++ xxdiff/ltconfig Thu Mar 15 21:23:45 2001
$OpenBSD: patch-ltconfig,v 1.2 2001/05/25 17:02:02 lebel Exp $
--- ltconfig.orig Thu May 24 14:24:14 2001
+++ ltconfig Thu May 24 14:27:29 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
@ -21,15 +22,15 @@ $OpenBSD: patch-ltconfig,v 1.1.1.1 2001/03/20 14:29:32 wilfried Exp $
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd2.[01234567])
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;

13
textproc/xxdiff/patches/patch-ltmain_sh
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/03/20 14:29:34 wilfried Exp $
--- xxdiff/ltmain.sh.orig Sun Mar 11 02:07:30 2001
+++ xxdiff/ltmain.sh Thu Mar 15 21:30:28 2001
$OpenBSD: patch-ltmain_sh,v 1.2 2001/05/25 17:02:02 lebel Exp $
--- ltmain.sh.orig Thu May 24 14:20:27 2001
+++ ltmain.sh Thu May 24 14:23:56 2001
@@ -1079,7 +1079,18 @@ compiler."
# These systems don't actually have c library (as such)
continue
@ -35,9 +36,9 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/03/20 14:29:34 wilfried Exp $
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"

34
textproc/xxdiff/patches/patch-src_Makefile_in
View File

@ -1,11 +1,20 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2001/03/20 14:29:34 wilfried Exp $
$OpenBSD: patch-src_Makefile_in,v 1.2 2001/05/25 17:02:02 lebel Exp $
fixes for CXXFLAGS and GNU configure SEPARATE_BUILD support
--- xxdiff/src/Makefile.in.orig Sat Mar 10 20:07:27 2001
+++ xxdiff/src/Makefile.in Thu Mar 15 16:29:27 2001
@@ -245,7 +245,7 @@ man_MANS = xxdiff.1
xxdiff_METASOURCES = app.moc.cpp diffs.moc.cpp markersFileDialog.moc.cpp markersWidgetBase.moc.cpp merged.moc.cpp optionsDialogBase.moc.cpp optionsDialog.moc.cpp searchDialogBase.moc.cpp searchDialog.moc.cpp
--- src/Makefile.in.orig Fri May 25 11:00:25 2001
+++ src/Makefile.in Fri May 25 11:03:05 2001
@@ -191,7 +191,7 @@ bin_PROGRAMS = xxdiff
# Nix all that, we can now use libstdc++.
CXXFLAGS = @CXXFLAGS@ -I$(QTDIR)/include $(USER_INCLUDES) $(DEBUGFLAGS) $(COMPILER_MIPSPRO_CXXFLAGS) $(COMPILER_COMPAQCXX_CXXFLAGS) $(COMPILER_GNU_CXXFLAGS)
-LDFLAGS = @LDFLAGS@ -L$(QTDIR)/lib $(USER_LDFLAGS) -L/usr/X11R6/lib
+LDFLAGS = @LDFLAGS@ $(USER_LDFLAGS)
################################################################################
# add support for automatically-generated code documentation
@@ -246,7 +246,7 @@ man_MANS = xxdiff.1
xxdiff_METASOURCES = USE_AUTOMOC
@DEBUG_TRUE@DEBUGFLAGS = -g
-@DEBUG_FALSE@DEBUGFLAGS = -O3 $(MIPSSTRIPFLAGS)
@ -13,7 +22,7 @@ fixes for CXXFLAGS and GNU configure SEPARATE_BUILD support
#LINKSTATIC_LIBS = -Wl,-Bstatic -lqt -Wl,-Bdynamic
#
@@ -283,7 +283,7 @@ LDADD = $(COMPILER_MIPSPRO_LDADDA) $(CO
@@ -284,7 +284,7 @@ LDADD = $(COMPILER_MIPSPRO_LDADDA) $(CO
# To allow for proper definition of XX_THROW_NOTHING
@IS_COMPILER_COMPAQCXX_TRUE@COMPILER_COMPAQCXX_CXXFLAGS = -using_std -D__USE_STD_IOSTREAM -DCOMPILER_COMPAQCXX
@ -22,17 +31,8 @@ fixes for CXXFLAGS and GNU configure SEPARATE_BUILD support
@USE_STLPORT_TRUE@COMPILER_GNU_CXXFLAGS = -nostdinc++ -I/usr/include/stlport -D__SGI_STL_OWN_IOSTREAMS
#COMPILER_GNU_CXXFLAGS += -D__STL_USE_OWN_NAMESPACE
@@ -303,7 +303,7 @@ DISTCLEANFILES = rcfileParser.y.c rcfile
MAINTAINERCLEANFILES = xxdiff.catman man.h $(UIDESIGNER_HEADERS) $(UIDESIGNER_SOURCES)
-MOC = $(QTDIR)/bin/moc
+MOC = @MOC@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS)
@@ -666,10 +666,10 @@ $(UIDESIGNER_GENSOURCES) : $(UIDESIGNER_
ui_dialogs: $(UIDESIGNER_FILES)
@@ -609,10 +609,10 @@ ui_dialogs: $(UIDESIGNER_FILES)
help.o: ../configure.in
rcfileParser.lex.c rcfileParser.lex.h: rcfileParser.lex
- flex -orcfileParser.lex.c rcfileParser.lex

17
textproc/xxdiff/patches/patch-src_app_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_app_cpp,v 1.1.1.1 2001/03/20 14:29:34 wilfried Exp $
Fixes a bug in file name/title display in the windowmanager titlebar.
--- xxdiff/src/app.cpp.orig Thu Mar 15 11:56:51 2001
+++ xxdiff/src/app.cpp Thu Mar 15 13:20:00 2001
@@ -494,8 +494,8 @@ XxApp::XxApp( int argc, char** argv, boo
// Sets the title bar.
if ( _nbFiles == 2 ) {
QString str =
- QString(_files[0]->getName()) + " <-> " +
- QString(_files[1]->getName());
+ QString(_files[0]->getDisplayName()) + " <-> " +
+ QString(_files[1]->getDisplayName());
_mainWindow->setCaption( str );
}
else {

10
textproc/xxdiff/patches/patch-src_buffer_cpp
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_buffer_cpp,v 1.1.1.1 2001/03/20 14:29:32 wilfried Exp $
$OpenBSD: patch-src_buffer_cpp,v 1.2 2001/05/25 17:02:03 lebel Exp $
fixes multiple strcpy/strncpy/sprintf uses that could lead
to buffer overruns.
--- xxdiff/src/buffer.cpp.orig Thu Mar 15 11:57:03 2001
+++ xxdiff/src/buffer.cpp Thu Mar 15 13:47:30 2001
@@ -399,13 +398,13 @@ uint XxBuffer::computeLineNumbersWidth(
--- src/buffer.cpp.orig Thu May 24 00:40:20 2001
+++ src/buffer.cpp Thu May 24 14:33:11 2001
@@ -398,13 +398,13 @@ uint XxBuffer::computeLineNumbersWidth(
{
QFontMetrics fm( font );
char lnFormat[32];
@ -21,7 +21,7 @@ to buffer overruns.
QString str( buffer );
QRect rect = fm.boundingRect( str, str.length() );
@@ -505,7 +504,7 @@ const char* XxBuffer::renderLineNumber(
@@ -504,7 +504,7 @@ const char* XxBuffer::renderLineNumber(
const char* format
)
{

9
textproc/xxdiff/patches/patch-src_diffs_cpp
View File

@ -1,12 +1,11 @@
$OpenBSD: patch-src_diffs_cpp,v 1.1.1.1 2001/03/20 14:29:32 wilfried Exp $
$OpenBSD: patch-src_diffs_cpp,v 1.2 2001/05/25 17:02:03 lebel Exp $
fixes multiple strcpy and sprintf instances to potentially
prevent buffer overruns
--- xxdiff/src/diffs.cpp.orig Thu Mar 15 11:57:11 2001
+++ xxdiff/src/diffs.cpp Thu Mar 15 13:20:06 2001
@@ -77,26 +77,26 @@ std::string buildTag(
--- src/diffs.cpp.orig Thu May 24 00:40:20 2001
+++ src/diffs.cpp Thu May 24 14:38:50 2001
@@ -76,26 +76,26 @@ std::string buildTag(
{
char buf[ 1024 ];
char buf2[ 1024 ];

6
textproc/xxdiff/patches/patch-src_lineNumbers_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_lineNumbers_cpp,v 1.1.1.1 2001/03/20 14:29:34 wilfried Exp $
$OpenBSD: patch-src_lineNumbers_cpp,v 1.2 2001/05/25 17:02:03 lebel Exp $
changes sprintf -> snprintf to close potential buffer overrun
--- xxdiff/src/lineNumbers.cpp.orig Thu Mar 15 13:55:15 2001
+++ xxdiff/src/lineNumbers.cpp Thu Mar 15 13:55:18 2001
--- src/lineNumbers.cpp.orig Thu May 24 00:40:20 2001
+++ src/lineNumbers.cpp Thu May 24 14:40:36 2001
@@ -119,7 +119,7 @@ void XxLineNumbers::drawContents( QPaint
std::min( displayLines, diffs->getNbLines() - (topLine - 1) );