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

Unbreak by updating to 2.4 which uses tmake to configure.

Browse Source 
In part from maintainer Dan Weeks <danimal@danimal.org>.
This commit is contained in:
naddy 2002-04-09 15:43:40 +00:00
parent 581d2d4df0
commit 5ab5cdd47d
13 changed files with 81 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
textproc/xxdiff/Makefile
View File

@ -1,10 +1,10 @@
#$OpenBSD: Makefile,v 1.9 2001/10/28 12:30:14 espie Exp $
# $OpenBSD: Makefile,v 1.10 2002/04/09 15:43:40 naddy Exp $
COMMENT= "graphical file comparator and merge tool"
DISTNAME= xxdiff-1.13
DISTNAME= xxdiff-2.4
CATEGORIES= textproc x11
NEED_VERSION= 1.483
NEED_VERSION= 1.504
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xxdiff
@ -17,24 +17,17 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= qt2
BUILD_DEPENDS= ::devel/bison \
::x11/qt2-designer
BUILD_DEPENDS= ::devel/bison ::devel/tmake
USE_GMAKE= Yes
USE_X11= Yes
WRKDIST= ${WRKDIR}/${DISTNAME}/src
SEPARATE_BUILD= concurrent
NO_REGRESS= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= QTDIR="${LOCALBASE}" \
USER_LDFLAGS="-L${MODQT_LIBDIR} -L${LOCALBASE}/lib/X11 -L${LOCALBASE}/lib" \
USER_INCLUDES="-I${MODQT_INCDIR} -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include" \
MOC=${MODQT_MOC}
MAKE_ENV= ${CONFIGURE_ENV}
MAKE_FLAGS= CXXLD='${CXX} -L${MODQT_LIBDIR}'
do-configure:
@cd ${WRKSRC} && tmake xxdiff.pro > ${WRKSRC}/Makefile
post-patch:
@cd ${WRKSRC} && perl automoc -v
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xxdiff ${PREFIX}/bin/xxdiff
${INSTALL_MAN} ${WRKSRC}/xxdiff.1 ${PREFIX}/man/man1/xxdiff.1
.include <bsd.port.mk>

6
textproc/xxdiff/distinfo
View File

@ -1,3 +1,3 @@
MD5 (xxdiff-1.13.tar.gz) = 1496e80219882139badd566a8e0e7f56
RMD160 (xxdiff-1.13.tar.gz) = c93df062b6135f1e218b836a1466879c616b929d
SHA1 (xxdiff-1.13.tar.gz) = 834ccb81582be70b0ccfbbd85d210bf9d33d5b8c
MD5 (xxdiff-2.4.tar.gz) = c9966c078c0cfde264dcf91f7d2faa7d
RMD160 (xxdiff-2.4.tar.gz) = 10c9e6de4587d15e25966b491dc0564562ba459d
SHA1 (xxdiff-2.4.tar.gz) = a9ffdb8ebb79aa1c724b605a2084dbf00820cfcf

11
textproc/xxdiff/patches/patch-app_cpp Normal file
View File

@ -0,0 +1,11 @@
--- app.cpp.orig Tue Feb 26 18:00:47 2002
+++ app.cpp Tue Feb 26 18:01:14 2002
@@ -2118,7 +2118,7 @@ void XxApp::editFile( const QString& fil
size_t size;
/* Bind a name to the socket. */
name.sun_family = AF_FILE;
- ::strncpy( name.sun_path, "/tmp/xxdiff_socket", sizeof(name.sun_path) );
+ ::strlcpy( name.sun_path, "/tmp/xxdiff_socket", sizeof(name.sun_path) );
/* The size of the address is
the offset of the start of the filename,

11
textproc/xxdiff/patches/patch-buffer_cpp Normal file
View File

@ -0,0 +1,11 @@
--- buffer.cpp.orig Tue Feb 26 17:58:56 2002
+++ buffer.cpp Tue Feb 26 17:59:14 2002
@@ -291,7 +291,7 @@ void XxBuffer::setDirectoryEntries(
it != _directoryEntries.end();
++it ) {
int len = (*it).length();
- ::strncpy( bufferPtr, (*it).latin1(), len );
+ ::strlcpy( bufferPtr, (*it).latin1(), len );
bufferPtr[len] = '\n';
bufferPtr += len + 1;
}

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

@ -1,53 +0,0 @@
$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
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
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='$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
;;
os2*)
@@ -2021,13 +2035,10 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

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

@ -1,84 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2001/08/12 02:19:36 lebel Exp $
--- ltmain.sh.orig Sat Aug 11 21:24:16 2001
+++ ltmain.sh Sat Aug 11 21:27:36 2001
@@ -1031,12 +1031,28 @@ compiler."
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
esac
fi
deplibs="$deplibs $arg"
continue
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -2405,6 +2421,9 @@ compiler."
# Rhapsody C library is in the System framework
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
@@ -4412,40 +4431,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

30
textproc/xxdiff/patches/patch-resParser_l Normal file
View File

@ -0,0 +1,30 @@
--- resParser.l.orig Tue Feb 26 18:01:36 2002
+++ resParser.l Tue Feb 26 18:02:09 2002
@@ -65,11 +65,11 @@ iddot [a-zA-Z][a-zA-Z0-9\.]*
{geomspec} {
int len = ::strlen( yytext );
if ( len >= LEX_BUFFER_MAX ) {
- ::strncpy( lexerBuffer, yytext, LEX_BUFFER_MAX );
+ ::strlcpy( lexerBuffer, yytext, LEX_BUFFER_MAX );
lexerBuffer[ LEX_BUFFER_MAX-1 ] = 0;
}
else {
- ::strncpy( lexerBuffer, yytext, len );
+ ::strlcpy( lexerBuffer, yytext, len );
}
yylval->str = lexerBuffer;
BEGIN(INITIAL);
@@ -206,11 +206,11 @@ iddot [a-zA-Z][a-zA-Z0-9\.]*
/* strip the quotes */
int len = ::strlen( yytext );
if ( len >= LEX_BUFFER_MAX ) {
- ::strncpy( lexerBuffer, &(yytext[1]), LEX_BUFFER_MAX );
+ ::strlcpy( lexerBuffer, &(yytext[1]), LEX_BUFFER_MAX );
lexerBuffer[ LEX_BUFFER_MAX-1 ] = 0;
}
else {
- ::strncpy( lexerBuffer, &(yytext[1]), len-2 );
+ ::strlcpy( lexerBuffer, &(yytext[1]), len-2 );
lexerBuffer[ len-2 ] = 0;
}
yylval->str = lexerBuffer;

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

@ -1,35 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2001/08/12 02:19:36 lebel Exp $
--- src/Makefile.in.orig Sat Aug 11 20:23:17 2001
+++ src/Makefile.in Sat Aug 11 20:24:29 2001
@@ -244,7 +244,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
@DEBUG_TRUE@DEBUGFLAGS = -g
-@DEBUG_FALSE@DEBUGFLAGS = -O3 $(MIPSSTRIPFLAGS)
+@DEBUG_FALSE@DEBUGFLAGS = $(MIPSSTRIPFLAGS)
#LINKSTATIC_LIBS = -Wl,-Bstatic -lqt -Wl,-Bdynamic
#
@@ -282,7 +282,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
-@IS_COMPILER_GNU_TRUE@COMPILER_GNU_CXXFLAGS = -Wall -DCOMPILER_GNU
+@IS_COMPILER_GNU_TRUE@COMPILER_GNU_CXXFLAGS = @CXXFLAGS@ -DCOMPILER_GNU
@USE_STLPORT_TRUE@COMPILER_GNU_CXXFLAGS = -nostdinc++ -I/usr/include/stlport -D__SGI_STL_OWN_IOSTREAMS
#COMPILER_GNU_CXXFLAGS += -D__STL_USE_OWN_NAMESPACE
@@ -607,10 +607,10 @@ ui_dialogs: $(UIDESIGNER_FILES)
help.o: ../configure.in
rcfileParser.lex.c rcfileParser.lex.h: rcfileParser.lex
- flex -orcfileParser.lex.c rcfileParser.lex
+ flex -orcfileParser.lex.c $(srcdir)/rcfileParser.lex
rcfileParser.y.c rcfileParser.y.h: rcfileParser.y
- bison -d -orcfileParser.y.c rcfileParser.y
+ bison -d -orcfileParser.y.c $(srcdir)/rcfileParser.y
rcfileParser.o: rcfileParser.y.c rcfileParser.lex.c

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

@ -1,20 +0,0 @@
--- src/buffer.cpp.orig Wed Jun 20 14:41:45 2001
+++ src/buffer.cpp Wed Jun 20 14:51:13 2001
@@ -248,7 +248,7 @@ void XxBuffer::loadDirectory( struct sta
}
char* newString = new char[ d_size + 1 ];
- ::strncpy( newString, d_name, d_size );
+ ::strlcpy( newString, d_name, d_size );
newString[ d_size ] = 0;
XX_CHECK( newString != 0 && d_name != 0 && d_size > 0 );
@@ -297,7 +297,7 @@ void XxBuffer::setDirectoryEntries(
char* bufferPtr = _buffer;
for ( uint ii = 0; ii < _directoryEntries.size(); ++ii ) {
int len = ::strlen( _directoryEntries[ii] );
- ::strncpy( bufferPtr, _directoryEntries[ii], len );
+ ::strlcpy( bufferPtr, _directoryEntries[ii], len );
bufferPtr[len] = '\n';
bufferPtr += len + 1;
}

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

@ -1,22 +0,0 @@
--- src/diffs.cpp.orig Wed Jun 20 14:41:57 2001
+++ src/diffs.cpp Wed Jun 20 14:47:37 2001
@@ -79,16 +79,16 @@ std::string buildTag(
{
char buf[ 1024 ];
char buf2[ 1024 ];
- ::strncpy( buf, tag, sizeof(buf) );
+ ::strlcpy( buf, tag, sizeof(buf) );
// FIXME this could lead to a bug.
if ( useNumber ) {
- ::strncpy( buf2, buf, sizeof(buf2) );
+ ::strlcpy( buf2, buf, sizeof(buf2) );
::snprintf( buf, sizeof(buf), buf2, number );
}
if ( useString ) {
- ::strncpy( buf2, buf, sizeof(buf2) );
+ ::strlcpy( buf2, buf, sizeof(buf2) );
if ( useConditionals ) {
if ( nbFiles == 3 && ( number == 1 || number == 2 ) ) {
::snprintf( buf, sizeof(buf), buf2, conditional2.c_str() );

11
textproc/xxdiff/patches/patch-xxdiff_1 Normal file
View File

@ -0,0 +1,11 @@
--- xxdiff.1.orig Tue Feb 26 18:08:26 2002
+++ xxdiff.1 Tue Feb 26 18:09:18 2002
@@ -18,7 +18,7 @@
.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
.\"
.na
-.TH XXDIFF 2.1
+.TH XXDIFF 2.4
.SH NAME
xxdiff \- a graphical file comparator and merge tool
.SH SYNOPSIS

2
textproc/xxdiff/pkg/PLIST
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/03/20 14:29:34 wilfried Exp $
@comment $OpenBSD: PLIST,v 1.2 2002/04/09 15:43:40 naddy Exp $
bin/xxdiff
man/man1/xxdiff.1

4
textproc/xxdiff/pkg/SECURITY
View File

@ -1,9 +1,11 @@
$OpenBSD: SECURITY,v 1.3 2001/06/20 19:31:00 lebel Exp $
$OpenBSD: SECURITY,v 1.4 2002/04/09 15:43:40 naddy Exp $
Xxdiff uses strncpy in a few functions.
The included patches correct the usage to
strlcpy where needed.
Files affected are:
${WRKSRC}/src/app.cpp
${WRKSRC}/src/buffer.cpp
${WRKSRC}/src/diffs.cpp
${WRKSRC}/src/resParser.l