diff options
| author | joerg <joerg@pkgsrc.org> | 2012-05-22 05:55:59 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-05-22 05:55:59 +0000 |
| commit | 93227baaa654d53daed0cd8d757fa242af34f23b (patch) | |
| tree | 893c7c2bf44043f5a63d932a76632f557c441c49 /editors | |
| parent | 7d30ccf8aea02e8897a9289b4e8b8f262b4ef03c (diff) | |
| download | pkgsrc-93227baaa654d53daed0cd8d757fa242af34f23b.tar.gz | |
Deal with the fact that Makefile.in is now regenerated by also patching
Makefile.am as appropiate. automake can't be run directly, since it
doesn't like configure itself.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/nvi/distinfo | 3 | ||||
| -rw-r--r-- | editors/nvi/patches/patch-.._dist_Makefile.am | 38 |
2 files changed, 40 insertions, 1 deletions
diff --git a/editors/nvi/distinfo b/editors/nvi/distinfo index 5c984ae4e98..f2e3c4ce27d 100644 --- a/editors/nvi/distinfo +++ b/editors/nvi/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.15 2012/03/26 14:00:40 joerg Exp $ +$NetBSD: distinfo,v 1.16 2012/05/22 05:55:59 joerg Exp $ SHA1 (nvi-1.81.6.tar.bz2) = d3445ed69166102735335a2ff60d092d9a9143c6 RMD160 (nvi-1.81.6.tar.bz2) = 0db8568bea96392d9a027044177c60317c8ade36 Size (nvi-1.81.6.tar.bz2) = 1758309 bytes +SHA1 (patch-.._dist_Makefile.am) = bc506e1701dcde6cb30762b3d4b88304e81c7355 SHA1 (patch-.._dist_configure.in) = 0341e7579b123b59f7ac8ecf1b2c4e8695f12118 SHA1 (patch-.._ex_ex__script.c) = f294a079a4d830604cbf24bb31e89ceeb0f8f354 SHA1 (patch-aa) = 05b8dedd194b09ed5af1fb62273e771ebd7f4326 diff --git a/editors/nvi/patches/patch-.._dist_Makefile.am b/editors/nvi/patches/patch-.._dist_Makefile.am new file mode 100644 index 00000000000..d4a035f5056 --- /dev/null +++ b/editors/nvi/patches/patch-.._dist_Makefile.am @@ -0,0 +1,38 @@ +$NetBSD: patch-.._dist_Makefile.am,v 1.1 2012/05/22 05:55:59 joerg Exp $ + +--- ../dist/Makefile.am.orig 2012-05-21 13:09:39.000000000 +0000 ++++ ../dist/Makefile.am +@@ -242,7 +242,7 @@ vi_motif_LDADD = @MOTIFLIBS@ @LIBOBJS@ + vi_motif_CFLAGS = @XINCS@ + + VI=-DVI=\"$(bindir)/`echo vi-ipc | sed '$(transform)'`\" +-CFLAGS= $(OPTFLAG) ++CFLAGS= @CFLAGS@ + AM_CPPFLAGS= -D__REGEX_PRIVATE -I. -I$(visrcdir)/include $(VI) + PERL= @vi_cv_path_perl@ + PERLLIB=@vi_cv_perllib@ +@@ -283,24 +283,7 @@ install-data-local: install_common + @[ -d $(DESTDIR)$(mandir) ] || \ + ($(mkdir) $(DESTDIR)$(mandir) && \ + $(chmod) $(dmode) $(DESTDIR)$(mandir)) +- @[ -d $(DESTDIR)$(mandir)/cat1 ] || \ +- ($(mkdir) $(DESTDIR)$(mandir)/cat1 && \ +- $(chmod) $(dmode) $(DESTDIR)$(mandir)/cat1) + @echo "Installing man pages: $(DESTDIR)$(mandir) ..." +- @cd $(DESTDIR)$(mandir)/cat1 && \ +- $(rm) -f `echo vi.0 | sed '$(transform)'` +- @$(cp) $(visrcdir)/docs/vi.man/vi.0 \ +- $(DESTDIR)$(mandir)/cat1/`echo vi.0 | sed '$(transform)'` +- @cd $(DESTDIR)$(mandir)/cat1 && \ +- $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'` +- @cd $(DESTDIR)$(mandir)/cat1 && \ +- $(rm) -f `echo ex.0 | sed '$(transform)'` +- @cd $(DESTDIR)$(mandir)/cat1 && \ +- $(rm) -f `echo view.0 | sed '$(transform)'` +- @cd $(DESTDIR)$(mandir)/cat1 && $(ln) \ +- `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'` +- @cd $(DESTDIR)$(mandir)/cat1 && $(ln) \ +- `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'` + @[ -d $(DESTDIR)$(mandir)/man1 ] || \ + ($(mkdir) $(DESTDIR)$(mandir)/man1 && \ + $(chmod) $(dmode) $(DESTDIR)$(mandir)/man1) |