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

update gdiff to diffutils 3.3, the existence of which was pointed out by

Browse Source 
Jeremie Courrege-Anglas, which works with 64-bit time_t
This commit is contained in:
sthen 2013-05-02 13:21:16 +00:00
parent cd9d5933ad
commit 1baed3c0ed
5 changed files with 42 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
textproc/gdiff/Makefile
View File

@ -1,28 +1,35 @@
# $OpenBSD: Makefile,v 1.16 2013/03/11 11:42:41 espie Exp $
# $OpenBSD: Makefile,v 1.17 2013/05/02 13:21:16 sthen Exp $
COMMENT= GNU versions of the diff utilities
VERSION= 2.8.1
VERSION= 3.3
EXTRACT_SUFX= .tar.xz
DISTNAME= diffutils-${VERSION}
PKGNAME= gdiff-${VERSION}
REVISION = 0
CATEGORIES= textproc
HOMEPAGE= http://www.gnu.org/software/diffutils/
# GPL
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
WANTLIB= c sigsegv
MASTER_SITES= ${MASTER_SITE_GNU:=diffutils/}
MODULES= devel/gettext
LIB_DEPENDS= devel/libsigsegv
SEPARATE_BUILD= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --program-prefix=g
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
USE_GROFF = Yes
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux
# handle --program-prefix: the help-version test runs sdiff which calls
# out to gdiff, but it doesn't have that name until installed.
pre-test:
cd ${WRKBUILD}/src; ln -fs diff gdiff
TEST_FLAGS= HOME=/tmp
.include <bsd.port.mk>

7
textproc/gdiff/distinfo
View File

@ -1,5 +1,2 @@
MD5 (diffutils-2.8.1.tar.gz) = cfnFrhm2Bgj2x/Fi2oakKA==
RMD160 (diffutils-2.8.1.tar.gz) = phsVQB8UAJfTnf4AzSqAYrzfqg4=
SHA1 (diffutils-2.8.1.tar.gz) = pMRnw6agjN6fPZTQIGfsJkNufcU=
SHA256 (diffutils-2.8.1.tar.gz) = xQAXSLBpIk3Zi/G7nuh3Mhx96LMyyKrVrz4qc3LSP1o=
SIZE (diffutils-2.8.1.tar.gz) = 780086
SHA256 (diffutils-3.3.tar.xz) = ol6JqKtl/e0XMeQYa+G7Jc2pZ4NLbflzWZzc1avfwZw=
SIZE (diffutils-3.3.tar.xz) = 1197832

55
textproc/gdiff/patches/patch-configure
View File

@ -1,55 +0,0 @@
$OpenBSD: patch-configure,v 1.4 2005/02/21 14:29:47 alek Exp $
--- configure.orig Fri Apr 5 23:48:26 2002
+++ configure Mon Feb 21 15:17:11 2005
@@ -3722,7 +3722,7 @@ _ACEOF
cat >>confdefs.h <<\_ACEOF
-#define DEFAULT_DIFF_PROGRAM "diff"
+#define DEFAULT_DIFF_PROGRAM "gdiff"
_ACEOF
@@ -5870,7 +5870,6 @@ else
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
@@ -5886,7 +5885,7 @@ int
main ()
{
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
;
return 0;
}
@@ -5917,7 +5916,6 @@ rm -f conftest.$ac_objext conftest$ac_ex
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
@@ -5933,7 +5931,7 @@ int
main ()
{
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
;
return 0;
}
@@ -14667,7 +14665,7 @@ s,@USE_NLS@,$USE_NLS,;t t
s,@LIBICONV@,$LIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@INTLLIBS@,$INTLLIBS,;t t
-s,@LIBINTL@,$LIBINTL,;t t
+s,@LIBINTL@,$LTLIBINTL,;t t
s,@LTLIBINTL@,$LTLIBINTL,;t t
s,@POSUB@,$POSUB,;t t
s,@LIBOBJS@,$LIBOBJS,;t t

20
textproc/gdiff/patches/patch-m4_Makefile_in
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-m4_Makefile_in,v 1.2 2004/08/11 20:55:50 naddy Exp $
--- m4/Makefile.in.orig Fri Apr 5 15:19:17 2002
+++ m4/Makefile.in Wed Aug 11 12:09:52 2004
@@ -257,14 +257,14 @@ uninstall-am: uninstall-info-am
Makefile.am: Makefile.am.in
rm -f $@ $@t
- sed -n '1,/^##m4-files-begin/p' $< > $@t
+ sed -n '1,/^##m4-files-begin/p' $? > $@t
(((echo EXTRA_DIST =; \
echo " README jm-glibc-io.m4 Makefile.am.in" \
) | tr '\012' @); \
(echo *.m4|tr ' ' @) ) \
|sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
>> $@t
- sed -n '/^##m4-files-end/,$$p' $< >> $@t
+ sed -n '/^##m4-files-end/,$$p' $? >> $@t
chmod a-w $@t
mv $@t $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.

33
textproc/gdiff/pkg/PLIST
View File

@ -1,28 +1,43 @@
@comment $OpenBSD: PLIST,v 1.5 2004/08/11 20:55:50 naddy Exp $
bin/gcmp
bin/gdiff
bin/gdiff3
bin/gsdiff
@info info/diff.info
@comment $OpenBSD: PLIST,v 1.6 2013/05/02 13:21:16 sthen Exp $
@bin bin/gcmp
@bin bin/gdiff
@bin bin/gdiff3
@bin bin/gsdiff
@info info/diffutils.info
@comment lib/charset.alias
@man man/man1/gcmp.1
@man man/man1/gdiff.1
@man man/man1/gdiff3.1
@man man/man1/gsdiff.1
share/locale/ca/LC_MESSAGES/diffutils.mo
share/locale/cs/LC_MESSAGES/diffutils.mo
share/locale/da/LC_MESSAGES/diffutils.mo
share/locale/de/LC_MESSAGES/diffutils.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/diffutils.mo
share/locale/el/LC_MESSAGES/diffutils.mo
share/locale/eo/LC_MESSAGES/diffutils.mo
share/locale/es/LC_MESSAGES/diffutils.mo
share/locale/fi/LC_MESSAGES/diffutils.mo
share/locale/fr/LC_MESSAGES/diffutils.mo
share/locale/ga/LC_MESSAGES/diffutils.mo
share/locale/gl/LC_MESSAGES/diffutils.mo
share/locale/he/LC_MESSAGES/diffutils.mo
share/locale/hu/LC_MESSAGES/diffutils.mo
share/locale/id/LC_MESSAGES/diffutils.mo
share/locale/it/LC_MESSAGES/diffutils.mo
share/locale/ja/LC_MESSAGES/diffutils.mo
share/locale/lv/LC_MESSAGES/diffutils.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/diffutils.mo
share/locale/nl/LC_MESSAGES/diffutils.mo
share/locale/pl/LC_MESSAGES/diffutils.mo
share/locale/pt_BR/LC_MESSAGES/diffutils.mo
share/locale/ro/LC_MESSAGES/diffutils.mo
share/locale/ru/LC_MESSAGES/diffutils.mo
share/locale/sr/LC_MESSAGES/diffutils.mo
share/locale/sv/LC_MESSAGES/diffutils.mo
share/locale/tr/LC_MESSAGES/diffutils.mo
share/locale/uk/LC_MESSAGES/diffutils.mo
share/locale/vi/LC_MESSAGES/diffutils.mo
share/locale/zh_CN/LC_MESSAGES/diffutils.mo
share/locale/zh_TW/LC_MESSAGES/diffutils.mo