don't install originals of patched scripts;
install mailcap in /etc (unless there is already a copy there; sample mailcap installed in /usr/local/lib/metamail; clean up PLIST for proper package installation
This commit is contained in:
marc
parent
13054b6a3f
commit
1ac3cf70f2
@ -3,24 +3,25 @@
|
||||
# Date created: 10 Nov 1997
|
||||
# Whom: ejovi
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.2 1997/11/17 21:47:30 joey Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 1998/07/26 06:28:59 marc Exp $
|
||||
#
|
||||
|
||||
DISTNAME= mm2.7
|
||||
PKGNAME= mm-2.7
|
||||
CATEGORIES= mail
|
||||
|
||||
MAINTAINER= marc@OpenBSD.ORG
|
||||
|
||||
MASTER_SITES= ftp://thumper.bellcore.com/pub/nsb/
|
||||
EXTRACT_SUFX= .tar.Z
|
||||
|
||||
MAINTAINER= joey@OpenBSD.ORG
|
||||
|
||||
WRKSRC= ${WRKDIR}/${DISTNAME}/src
|
||||
MAN1= audiocompose.1 audiosend.1 extcompose.1 \
|
||||
getfilename.1 mailto-hebrew.1 mailto.1 metamail.1 \
|
||||
metasend.1 mime.1 mimencode.1 mmencode.1 \
|
||||
patch-metamail.1 richtext.1 showaudio.1 \
|
||||
showexternal.1 shownonascii.1 showpartial.1 \
|
||||
showpicture.1 splitmail.1
|
||||
MAN4= mailcap.4
|
||||
|
||||
pre-install:
|
||||
@(cd ${WRKSRC}/bin && rm -f *.orig)
|
||||
|
||||
post-install:
|
||||
@test -f /etc/mailcap || \
|
||||
${INSTALL_DATA} ${PREFIX}/lib/metamail/mailcap /etc
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,111 +1,77 @@
|
||||
*** Makefile.orig Wed Jan 26 20:32:33 1994
|
||||
--- Makefile Mon Nov 20 01:31:41 1995
|
||||
***************
|
||||
*** 38,44 ****
|
||||
|
||||
STATICFLAG=FOOBAR${HOST_ARCH}
|
||||
|
||||
! CFLAGS = -g -I. ${$(STATICFLAG)}
|
||||
# The following is better if you want to make sure you run with SYSV defined
|
||||
# CFLAGS = -g -I. ${$(STATICFLAG)} -DSYSV
|
||||
# Also, for SGI Irix, compile in K&R mode
|
||||
--- 38,44 ----
|
||||
|
||||
STATICFLAG=FOOBAR${HOST_ARCH}
|
||||
|
||||
! CFLAGS += -I. ${$(STATICFLAG)}
|
||||
# The following is better if you want to make sure you run with SYSV defined
|
||||
# CFLAGS = -g -I. ${$(STATICFLAG)} -DSYSV
|
||||
# Also, for SGI Irix, compile in K&R mode
|
||||
***************
|
||||
*** 49,57 ****
|
||||
# LDLIBS variable.
|
||||
#
|
||||
# For Sun and BSD systems, the following should work...
|
||||
! LDLIBS =
|
||||
# On BSD 4.4 systems, you will need the following
|
||||
! # LDLIBS = -lcompat
|
||||
# On SGI machines, we need -lsun for getpw...(), and -lc_s saves some space.
|
||||
# LDLIBS = -lsun -lc_s
|
||||
# ISC SysVr3.2.2 has a shared C library and requires libinet.a to resolve
|
||||
--- 49,57 ----
|
||||
# LDLIBS variable.
|
||||
#
|
||||
# For Sun and BSD systems, the following should work...
|
||||
! # LDLIBS =
|
||||
# On BSD 4.4 systems, you will need the following
|
||||
! LDLIBS = -s -lcompat
|
||||
# On SGI machines, we need -lsun for getpw...(), and -lc_s saves some space.
|
||||
# LDLIBS = -lsun -lc_s
|
||||
# ISC SysVr3.2.2 has a shared C library and requires libinet.a to resolve
|
||||
***************
|
||||
*** 72,81 ****
|
||||
# install -s -c $(LOCALBINDIR) $$file
|
||||
#
|
||||
#INSTALL = cp
|
||||
! INSTALL = install -c -s
|
||||
|
||||
# Root of installation tree
|
||||
! INSTROOT = /usr/local
|
||||
#
|
||||
# This is where binaries should be copied
|
||||
LOCALBINDIR = ${INSTROOT}/bin
|
||||
--- 72,81 ----
|
||||
# install -s -c $(LOCALBINDIR) $$file
|
||||
#
|
||||
#INSTALL = cp
|
||||
! INSTALL = install -c
|
||||
|
||||
# Root of installation tree
|
||||
! INSTROOT = ${PREFIX}
|
||||
#
|
||||
# This is where binaries should be copied
|
||||
LOCALBINDIR = ${INSTROOT}/bin
|
||||
***************
|
||||
*** 96,104 ****
|
||||
# This helps with the "for" constructs below on some platforms:
|
||||
SHELL=/bin/sh
|
||||
|
||||
! install: basics
|
||||
|
||||
! basics::
|
||||
(cd metamail ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}")
|
||||
-${RM} bin/metamail
|
||||
(cd bin; ${LN} ../metamail/metamail metamail)
|
||||
--- 96,104 ----
|
||||
# This helps with the "for" constructs below on some platforms:
|
||||
SHELL=/bin/sh
|
||||
|
||||
! install: install-all
|
||||
|
||||
! all basics::
|
||||
(cd metamail ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}")
|
||||
-${RM} bin/metamail
|
||||
(cd bin; ${LN} ../metamail/metamail metamail)
|
||||
***************
|
||||
*** 117,123 ****
|
||||
(cd bin; ${LN} ../richmail/richtext richtext)
|
||||
-${RM} bin/richtoatk
|
||||
(cd bin; ${LN} ../richmail/richtoatk richtoatk)
|
||||
! (cd fonts ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}")
|
||||
-${RM} bin/shownonascii
|
||||
(cd bin; ${LN} ../fonts/shownonascii shownonascii)
|
||||
-${RM} bin/mailto-hebrew
|
||||
--- 117,123 ----
|
||||
(cd bin; ${LN} ../richmail/richtext richtext)
|
||||
-${RM} bin/richtoatk
|
||||
(cd bin; ${LN} ../richmail/richtoatk richtoatk)
|
||||
! (cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}")
|
||||
-${RM} bin/shownonascii
|
||||
(cd bin; ${LN} ../fonts/shownonascii shownonascii)
|
||||
-${RM} bin/mailto-hebrew
|
||||
***************
|
||||
*** 149,154 ****
|
||||
--- 149,155 ----
|
||||
-mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old
|
||||
@echo "installing file $(MAILCAPDIR)/mailcap"
|
||||
${CP} mailcap $(MAILCAPDIR)
|
||||
+ (cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}" install)
|
||||
|
||||
uninstall-all:
|
||||
@(cd bin; \
|
||||
--- Makefile.orig Wed Jan 26 09:32:33 1994
|
||||
+++ Makefile Sat Jul 25 22:42:41 1998
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
STATICFLAG=FOOBAR${HOST_ARCH}
|
||||
|
||||
-CFLAGS = -g -I. ${$(STATICFLAG)}
|
||||
+CFLAGS += -I. ${$(STATICFLAG)}
|
||||
# The following is better if you want to make sure you run with SYSV defined
|
||||
# CFLAGS = -g -I. ${$(STATICFLAG)} -DSYSV
|
||||
# Also, for SGI Irix, compile in K&R mode
|
||||
@@ -49,9 +49,9 @@
|
||||
# LDLIBS variable.
|
||||
#
|
||||
# For Sun and BSD systems, the following should work...
|
||||
-LDLIBS =
|
||||
+# LDLIBS =
|
||||
# On BSD 4.4 systems, you will need the following
|
||||
-# LDLIBS = -lcompat
|
||||
+LDLIBS = -s -lcompat
|
||||
# On SGI machines, we need -lsun for getpw...(), and -lc_s saves some space.
|
||||
# LDLIBS = -lsun -lc_s
|
||||
# ISC SysVr3.2.2 has a shared C library and requires libinet.a to resolve
|
||||
@@ -72,10 +72,10 @@
|
||||
# install -s -c $(LOCALBINDIR) $$file
|
||||
#
|
||||
#INSTALL = cp
|
||||
-INSTALL = install -c -s
|
||||
+INSTALL = install -c
|
||||
|
||||
# Root of installation tree
|
||||
-INSTROOT = /usr/local
|
||||
+INSTROOT = ${PREFIX}
|
||||
#
|
||||
# This is where binaries should be copied
|
||||
LOCALBINDIR = ${INSTROOT}/bin
|
||||
@@ -91,14 +91,14 @@
|
||||
FONTSUFFIX=pcf
|
||||
|
||||
# This is where the mailcap file should be put
|
||||
-MAILCAPDIR = ${INSTROOT}/etc
|
||||
+MAILCAPDIR = ${INSTROOT}/lib/metamail
|
||||
|
||||
# This helps with the "for" constructs below on some platforms:
|
||||
SHELL=/bin/sh
|
||||
|
||||
-install: basics
|
||||
+install: install-all
|
||||
|
||||
-basics::
|
||||
+all basics::
|
||||
(cd metamail ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}")
|
||||
-${RM} bin/metamail
|
||||
(cd bin; ${LN} ../metamail/metamail metamail)
|
||||
@@ -117,7 +117,7 @@
|
||||
(cd bin; ${LN} ../richmail/richtext richtext)
|
||||
-${RM} bin/richtoatk
|
||||
(cd bin; ${LN} ../richmail/richtoatk richtoatk)
|
||||
- (cd fonts ; $(MAKE) CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}")
|
||||
+ (cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}")
|
||||
-${RM} bin/shownonascii
|
||||
(cd bin; ${LN} ../fonts/shownonascii shownonascii)
|
||||
-${RM} bin/mailto-hebrew
|
||||
@@ -145,10 +145,12 @@
|
||||
echo "installing man page $$target";\
|
||||
${CP} $$file $$target; \
|
||||
done)
|
||||
+ @mkdir -p $(MAILCAPDIR)
|
||||
@echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old
|
||||
- -mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old
|
||||
+ @-mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old
|
||||
@echo "installing file $(MAILCAPDIR)/mailcap"
|
||||
${CP} mailcap $(MAILCAPDIR)
|
||||
+ (cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR} CFLAGS="${CFLAGS}" CC="${CC}" LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}" install)
|
||||
|
||||
uninstall-all:
|
||||
@(cd bin; \
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
@cwd /usr/local
|
||||
@name mm-2.7
|
||||
bin/audiocompose
|
||||
bin/audiosend
|
||||
bin/extcompose
|
||||
@ -24,13 +26,12 @@ bin/sun-audio-file
|
||||
bin/sun-message.csh
|
||||
bin/sun-to-mime
|
||||
bin/sun2mime
|
||||
bin/sun2mime.orig
|
||||
lib/metamail/fonts/heb6x13.pcf
|
||||
lib/metamail/fonts/heb8x13.pcf
|
||||
lib/metamail/fonts/heb8x13B.pcf
|
||||
lib/metamail/fonts/fonts.dir
|
||||
lib/metamail/fonts/fonts.alias
|
||||
etc/mailcap
|
||||
lib/metamail/fonts/fonts.dir
|
||||
lib/metamail/mailcap
|
||||
man/man1/audiocompose.1
|
||||
man/man1/audiosend.1
|
||||
man/man1/extcompose.1
|
||||
@ -51,3 +52,11 @@ man/man1/showpartial.1
|
||||
man/man1/showpicture.1
|
||||
man/man1/splitmail.1
|
||||
man/man4/mailcap.4
|
||||
@exec test -f /etc/mailcap || install -m 644 %D/lib/metamail/mailcap /etc
|
||||
@exec test -d /usr/X11R6 && mkfontdir %D/lib/metamail/fonts
|
||||
@dirrm lib/metamail/fonts
|
||||
@dirrm lib/metamail
|
||||
@unexec echo ""
|
||||
@unexec echo "*** To completely remove this package you must also remove the"
|
||||
@unexec echo "*** file /etc/mailcap"
|
||||
@unexec echo ""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user