update textproc/xxdiff to 1.13; from maintainer Dan Weeks <danimal@danimal.org>
This commit is contained in:
lebel
parent
bff378075d
commit
0f54ff29cc
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2001/06/20 19:30:59 lebel Exp $
|
||||
#$OpenBSD: Makefile,v 1.8 2001/08/12 02:19:36 lebel Exp $
|
||||
|
||||
COMMENT= "graphical file comparator and merge tool"
|
||||
|
||||
DISTNAME= xxdiff-1.12
|
||||
DISTNAME= xxdiff-1.13
|
||||
CATEGORIES= textproc x11
|
||||
NEED_VERSION= 1.414
|
||||
NEED_VERSION= 1.434
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= xxdiff
|
||||
|
||||
@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
LIB_DEPENDS= qt.2::x11/qt2
|
||||
LIB_DEPENDS= qt.2.::x11/qt2
|
||||
BUILD_DEPENDS= bison::devel/bison \
|
||||
uic::x11/qt2-designer
|
||||
|
||||
@ -38,5 +38,3 @@ post-patch:
|
||||
@cd ${WRKSRC} && perl automoc -v
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (xxdiff-1.12.tar.gz) = a14dd641fe1d7f34a422210c1caa02f3
|
||||
RMD160 (xxdiff-1.12.tar.gz) = 5033f92ad8fc12f76eaf901cf317dbd539870508
|
||||
SHA1 (xxdiff-1.12.tar.gz) = 1f58c6f1213062b7f451aee428829f00547ee815
|
||||
MD5 (xxdiff-1.13.tar.gz) = 1496e80219882139badd566a8e0e7f56
|
||||
RMD160 (xxdiff-1.13.tar.gz) = c93df062b6135f1e218b836a1466879c616b929d
|
||||
SHA1 (xxdiff-1.13.tar.gz) = 834ccb81582be70b0ccfbbd85d210bf9d33d5b8c
|
||||
|
||||
@ -1,50 +1,49 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.2 2001/05/25 17:02:02 lebel Exp $
|
||||
$OpenBSD: patch-ltmain_sh,v 1.3 2001/08/12 02:19:36 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
|
||||
--- 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
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ elif test "$arg" = "-lc_r"; then
|
||||
+ case "$host" in
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc_r directly, use -pthread flag.
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
elif test "$arg" = "-lm"; then
|
||||
case "$host" in
|
||||
*-*-cygwin* | *-*-beos*)
|
||||
@@ -1091,6 +1102,10 @@ compiler."
|
||||
esac
|
||||
fi
|
||||
deplibs="$deplibs $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
+ -?thread)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ continue
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1799,6 +1814,9 @@ compiler."
|
||||
# rhapsody is a little odd...
|
||||
deplibs="$deplibs -framework System"
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ ;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems.
|
||||
deplibs="$deplibs -lc"
|
||||
@@ -3571,40 +3589,6 @@ libdir='$install_libdir'\
|
||||
@@ -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
|
||||
test "$show" = ":" && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
@ -54,7 +53,7 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2001/05/25 17:02:02 lebel Exp $
|
||||
- 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 \`-LLIBDIR'"
|
||||
- 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"
|
||||
|
||||
@ -1,20 +1,9 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.2 2001/05/25 17:02:02 lebel Exp $
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.3 2001/08/12 02:19:36 lebel Exp $
|
||||
|
||||
fixes for CXXFLAGS and GNU configure SEPARATE_BUILD support
|
||||
|
||||
--- 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
|
||||
--- 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)
|
||||
@ -22,7 +11,7 @@ fixes for CXXFLAGS and GNU configure SEPARATE_BUILD support
|
||||
|
||||
#LINKSTATIC_LIBS = -Wl,-Bstatic -lqt -Wl,-Bdynamic
|
||||
#
|
||||
@@ -284,7 +284,7 @@ LDADD = $(COMPILER_MIPSPRO_LDADDA) $(CO
|
||||
@@ -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
|
||||
@ -31,7 +20,7 @@ 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
|
||||
|
||||
@@ -609,10 +609,10 @@ ui_dialogs: $(UIDESIGNER_FILES)
|
||||
@@ -607,10 +607,10 @@ ui_dialogs: $(UIDESIGNER_FILES)
|
||||
help.o: ../configure.in
|
||||
|
||||
rcfileParser.lex.c rcfileParser.lex.h: rcfileParser.lex
|
||||
|
||||
Loading…
Reference in New Issue
Block a user