- update to 0.9.18
- fix up gettext autoconf breakage, get rid of workarounds
This commit is contained in:
naddy
parent
d1aafd23d0
commit
55487803d0
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2000/08/10 12:16:43 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2000/09/21 15:10:24 naddy Exp $
|
||||
|
||||
DISTNAME= nano-0.9.16
|
||||
DISTNAME= nano-0.9.18
|
||||
CATEGORIES= editors
|
||||
NEED_VERSION= 1.319
|
||||
NEED_VERSION= 1.333
|
||||
HOMEPAGE= http://www.asty.org/nano/
|
||||
|
||||
MAINTAINER= naddy@openbsd.org
|
||||
@ -21,12 +21,12 @@ FLAVOR?=
|
||||
|
||||
LIB_DEPENDS= intl.1::devel/gettext
|
||||
.if ${FLAVOR:L:Mslang}
|
||||
LIB_DEPENDS+= slang.14.1::devel/libslang
|
||||
LIB_DEPENDS+= slang.14.2::devel/libslang
|
||||
.endif
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --without-included-gettext \
|
||||
--includedir='${LOCALBASE}/include'
|
||||
CONFIGURE_STYLE= gnu autoconf
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
.if ${FLAVOR:L:Mslang}
|
||||
CONFIGURE_ARGS+= --with-slang='${LOCALBASE}'
|
||||
.endif
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (nano-0.9.16.tar.gz) = dc2187ba6d8363b1f2a3769401daeaa6
|
||||
RMD160 (nano-0.9.16.tar.gz) = d5bb0452bdfe0e841e516eeff75da98868014bc1
|
||||
SHA1 (nano-0.9.16.tar.gz) = ff5d41cc19648afbf415fdfef1654a547ad5183f
|
||||
MD5 (nano-0.9.18.tar.gz) = b5851b7fe56c557c6584097d28a1f002
|
||||
RMD160 (nano-0.9.18.tar.gz) = 931c3edfa63abf89fa111c1825b6d6d649576f2f
|
||||
SHA1 (nano-0.9.18.tar.gz) = 1e138a057b464d4fb53e825e838761089fdf38e7
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.3 2000/08/10 12:16:43 naddy Exp $
|
||||
--- Makefile.in.orig Wed Aug 9 23:56:05 2000
|
||||
+++ Makefile.in Thu Aug 10 13:49:48 2000
|
||||
@@ -73,7 +73,7 @@ GT_YES = @GT_YES@
|
||||
INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
|
||||
INSTOBJEXT = @INSTOBJEXT@
|
||||
INTLDEPS = @INTLDEPS@
|
||||
-INTLLIBS = @INTLLIBS@
|
||||
+INTLLIBS = -L$(LOCALBASE)/lib -lintl
|
||||
INTLOBJS = @INTLOBJS@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||
@@ -92,15 +92,16 @@ nano_SOURCES = cut.c files.c global.
|
||||
|
||||
|
||||
man_MANS = nano.1
|
||||
-nano_LDADD = @INTLLIBS@
|
||||
+nano_LDADD = $(INTLLIBS)
|
||||
|
||||
EXTRA_DIST = AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO install-sh missing mkinstalldirs nano.1 nano.1.html faq.html
|
||||
|
||||
|
||||
-SUBDIRS = po intl
|
||||
+SUBDIRS = po
|
||||
|
||||
localedir = $(datadir)/locale
|
||||
-INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
|
||||
+INCLUDES = -I$(LOCALBASE)/share/gettext/intl -DLOCALEDIR=\"$(localedir)\" \
|
||||
+ -I@includedir@
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = config.h
|
||||
16
editors/nano/patches/patch-aclocal_m4
Normal file
16
editors/nano/patches/patch-aclocal_m4
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.1 2000/09/21 15:10:25 naddy Exp $
|
||||
--- aclocal.m4.orig Thu Sep 21 16:29:40 2000
|
||||
+++ aclocal.m4 Thu Sep 21 16:32:43 2000
|
||||
@@ -370,10 +370,9 @@ AC_DEFUN(AM_WITH_NLS,
|
||||
|
||||
if test "$gt_cv_func_gettext_libc" != "yes"; then
|
||||
AC_CHECK_LIB(intl, bindtextdomain,
|
||||
- [AC_CACHE_CHECK([for gettext in libintl],
|
||||
- gt_cv_func_gettext_libintl,
|
||||
+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
|
||||
[AC_CHECK_LIB(intl, gettext,
|
||||
- gt_cv_func_gettext_libintl=yes,
|
||||
+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
|
||||
gt_cv_func_gettext_libintl=no)],
|
||||
gt_cv_func_gettext_libintl=no)])
|
||||
fi
|
||||
@ -1,50 +0,0 @@
|
||||
--- po/Makefile.in.in.orig Mon Aug 7 04:16:24 2000
|
||||
+++ po/Makefile.in.in Thu Aug 10 13:53:06 2000
|
||||
@@ -19,9 +19,10 @@
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
-datadir = $(prefix)/@DATADIRNAME@
|
||||
+datadir = $(prefix)/share
|
||||
localedir = $(datadir)/locale
|
||||
gnulocaledir = $(prefix)/share/locale
|
||||
+gettextintldir = $(prefix)/share/gettext/intl
|
||||
gettextsrcdir = $(prefix)/share/gettext/po
|
||||
subdir = po
|
||||
|
||||
@@ -40,7 +41,7 @@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
|
||||
-INCLUDES = -I.. -I$(top_srcdir)/intl
|
||||
+INCLUDES = -I$(LOCALBASE)/include -I$(gettextintldir)
|
||||
|
||||
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
|
||||
|
||||
@@ -74,7 +75,7 @@
|
||||
&& rm -f $$file && $(GMSGFMT) -o $$file $<
|
||||
|
||||
.po.cat:
|
||||
- sed -f ../intl/po2msg.sed < $< > $*.msg \
|
||||
+ sed -f $(gettextintldir)/po2msg.sed < $< > $*.msg \
|
||||
&& rm -f $@ && $(GENCAT) $@ $*.msg
|
||||
|
||||
|
||||
@@ -94,7 +95,7 @@
|
||||
$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
|
||||
$(srcdir)/stamp-cat-id: $(PACKAGE).pot
|
||||
rm -f cat-id-tbl.tmp
|
||||
- sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
|
||||
+ sed -f $(gettextintldir)/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
|
||||
| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
|
||||
if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
|
||||
rm cat-id-tbl.tmp; \
|
||||
@@ -184,7 +185,7 @@
|
||||
|
||||
check: all
|
||||
|
||||
-cat-id-tbl.o: ../intl/libgettext.h
|
||||
+cat-id-tbl.o: $(gettextintldir)/libgettext.h
|
||||
|
||||
dvi info tags TAGS ID:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user