Fix package building

Fix SSL building

Submitted by:	Udo Schweigert
Approved by:	obrien

6 files changed, 34 insertions, 22 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 8d28ccbc5eb5..29ca5bd35985 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -89,6 +89,9 @@ pre-configure:
 	cd ${WRKSRC}/charmaps/maps; ${LN} CP1251 WINDOWS-1251
 	cd ${WRKSRC}/charmaps/maps; ${RM} -f *.orig
 
+pre-build:
+	cd ${WRKSRC} && ${MAKE} keymap_defs.h
+
 .if !defined(NOPORTDOCS)
 post-build:
 	${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
diff --git a/mail/mutt/files/patch-Makefile.in b/mail/mutt/files/patch-Makefile.in
deleted file mode 100644
index 5e33d7c1abdf..000000000000
--- a/mail/mutt/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue May  9 17:15:37 2000
-+++ Makefile.in	Fri May 12 13:53:08 2000
-@@ -210,7 +210,7 @@
- SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES)
- OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(mutt_OBJECTS)
- 
--all: all-redirect
-+all: $(BUILT_SOURCES) all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
diff --git a/mail/mutt/files/patch-charmaps.Makefile.am b/mail/mutt/files/patch-charmaps.Makefile.am
new file mode 100644
index 000000000000..383b9d7039fd
--- /dev/null
+++ b/mail/mutt/files/patch-charmaps.Makefile.am
@@ -0,0 +1,14 @@
+--- charmaps/Makefile.am.orig	Mon Aug 23 22:12:09 1999
++++ charmaps/Makefile.am	Fri Dec  7 15:17:33 2001
+@@ -1,6 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-noinst_DATA = charmap_notice
+-
+-charmap_notice:
+-	@echo ; echo "For charmap support, please read INSTALL" ; echo
++install:
++	$(top_srcdir)/mkinstalldirs $(charmaps)
++	for f in $(top_srcdir)/$(subdir)/maps/* ; do \
++		$(INSTALL) -m 644 $$f $(charmaps)/ ; \
++	done
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 8d28ccbc5eb5..29ca5bd35985 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -89,6 +89,9 @@ pre-configure:
 	cd ${WRKSRC}/charmaps/maps; ${LN} CP1251 WINDOWS-1251
 	cd ${WRKSRC}/charmaps/maps; ${RM} -f *.orig
 
+pre-build:
+	cd ${WRKSRC} && ${MAKE} keymap_defs.h
+
 .if !defined(NOPORTDOCS)
 post-build:
 	${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
diff --git a/mail/mutt14/files/patch-Makefile.in b/mail/mutt14/files/patch-Makefile.in
deleted file mode 100644
index 5e33d7c1abdf..000000000000
--- a/mail/mutt14/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue May  9 17:15:37 2000
-+++ Makefile.in	Fri May 12 13:53:08 2000
-@@ -210,7 +210,7 @@
- SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES)
- OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(mutt_OBJECTS)
- 
--all: all-redirect
-+all: $(BUILT_SOURCES) all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
diff --git a/mail/mutt14/files/patch-charmaps.Makefile.am b/mail/mutt14/files/patch-charmaps.Makefile.am
new file mode 100644
index 000000000000..383b9d7039fd
--- /dev/null
+++ b/mail/mutt14/files/patch-charmaps.Makefile.am
@@ -0,0 +1,14 @@
+--- charmaps/Makefile.am.orig	Mon Aug 23 22:12:09 1999
++++ charmaps/Makefile.am	Fri Dec  7 15:17:33 2001
+@@ -1,6 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-noinst_DATA = charmap_notice
+-
+-charmap_notice:
+-	@echo ; echo "For charmap support, please read INSTALL" ; echo
++install:
++	$(top_srcdir)/mkinstalldirs $(charmaps)
++	for f in $(top_srcdir)/$(subdir)/maps/* ; do \
++		$(INSTALL) -m 644 $$f $(charmaps)/ ; \
++	done