diff options
| author | wiz <wiz@pkgsrc.org> | 2002-10-08 17:27:19 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2002-10-08 17:27:19 +0000 |
| commit | c5a1ca82c3e0764db8bdde3be298f76d3e99fc56 (patch) | |
| tree | 6c397b0f4e2fc1a9d4dfd9b49b95a5e4c3155905 /sysutils/mc | |
| parent | 6ddc290c656af907239971e98a3f6a7e71372eba (diff) | |
| download | pkgsrc-c5a1ca82c3e0764db8bdde3be298f76d3e99fc56.tar.gz | |
Use PKGLOCALEDIR instead of homebrew stuff.
Also patch out useless autoheader call, thus solving PR 18587.
Diffstat (limited to 'sysutils/mc')
| -rw-r--r-- | sysutils/mc/Makefile.common | 16 | ||||
| -rw-r--r-- | sysutils/mc/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/mc/patches/patch-aa | 6 | ||||
| -rw-r--r-- | sysutils/mc/patches/patch-ai | 13 |
4 files changed, 21 insertions, 19 deletions
diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common index b25d600cc6a..656da98816f 100644 --- a/sysutils/mc/Makefile.common +++ b/sysutils/mc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2002/10/02 19:09:02 wiz Exp $ +# $NetBSD: Makefile.common,v 1.15 2002/10/08 17:27:19 wiz Exp $ DISTNAME= mc-4.5.51 CATEGORIES+= sysutils @@ -33,23 +33,11 @@ CONFIGURE_ENV+= ac_cv_header_readline_history_h=no CONFIGURE_ENV+= ac_cv_header_readline_readline_h=no CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" -CONFIGURE_ENV+= LOCALEDIR="${LOCALEDIR}" +CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" LIBS+= -lm -ltermcap # -lslang LIBS+= -lintl # check for gettext is broken CPPFLAGS+= -I${LOCALBASE}/include # slang.h CPPFLAGS+= -Dunix -.include "../../mk/bsd.prefs.mk" - -# The directory in which locale files are found is: -# -# ${PREFIX}/${LOCALEDIR}/locale/<lang>/LC_MESSAGES -# -.if ${OPSYS} == "SunOS" -LOCALEDIR= lib -.else -LOCALEDIR= share -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/mc/distinfo b/sysutils/mc/distinfo index 6ee46846c16..15697c74070 100644 --- a/sysutils/mc/distinfo +++ b/sysutils/mc/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2002/07/24 05:05:59 hubertf Exp $ +$NetBSD: distinfo,v 1.5 2002/10/08 17:27:19 wiz Exp $ SHA1 (mc-4.5.51.tar.gz) = 24d5d90695266587a2e8190196b32c8f3a4b2406 Size (mc-4.5.51.tar.gz) = 4330056 bytes -SHA1 (patch-aa) = 22ef7d7983dfca3a90a6a59d6055a93410ff1783 +SHA1 (patch-aa) = 2d9a4dd69706c923ffb46aab044833f974bd8d11 SHA1 (patch-ab) = 6da1ccfdcd9b0623bf5619a99c59e67cd70b51b6 SHA1 (patch-ac) = 36ee4017c74f04efff92e2a79cdb40cd5a4de6ed SHA1 (patch-ad) = 4057502edcc25394211232e94fc8975ea0d9bf52 @@ -10,3 +10,4 @@ SHA1 (patch-ae) = c3ad5c2f2ad99782f343f7197a3ebcfb07366dee SHA1 (patch-af) = be7b6906f5cd23e28311519b42a1d8c630e98f2e SHA1 (patch-ag) = 60e697e475647038181d12186a0424c4a6165c59 SHA1 (patch-ah) = a5ef804a13870ae5d100a7f6fb45281303da82c3 +SHA1 (patch-ai) = 7bac376900226618f1bb5849cb5ac277bdd4e4f9 diff --git a/sysutils/mc/patches/patch-aa b/sysutils/mc/patches/patch-aa index 1ac6928533c..fe1a94b59af 100644 --- a/sysutils/mc/patches/patch-aa +++ b/sysutils/mc/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.10 2001/02/13 11:47:06 tron Exp $ +$NetBSD: patch-aa,v 1.11 2002/10/08 17:27:20 wiz Exp $ --- configure.orig Mon Jul 3 10:31:57 2000 +++ configure @@ -6,8 +6,8 @@ $NetBSD: patch-aa,v 1.10 2001/02/13 11:47:06 tron Exp $ -+# Set DATADIRNAME to "${LOCALEDIR}" -+DATADIRNAME="${LOCALEDIR}" ++# Set DATADIRNAME to "${PKGLOCALEDIR}" ++DATADIRNAME="${PKGLOCALEDIR}" +INTLDEPS= +INTLLIBS="-lintl" + diff --git a/sysutils/mc/patches/patch-ai b/sysutils/mc/patches/patch-ai new file mode 100644 index 00000000000..67bb2f4ea42 --- /dev/null +++ b/sysutils/mc/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2002/10/08 17:27:20 wiz Exp $ + +--- vfs/samba/Makefile.in.orig Tue Oct 8 19:13:16 2002 ++++ vfs/samba/Makefile.in +@@ -518,8 +518,6 @@ $(srcdir)/include/config.h.in: $(srcdir) + @: + + $(srcdir)/include/stamp-h.in: @MAINT@ $(srcdir)/acconfig.h $(srcdir)/configure.in +- cd $(srcdir) && $(AUTOHEADER) +- @date -u > $@ + + # automatic dependency tracking rules + .deps/.dummy: |