diff --git a/editors/e3/Makefile b/editors/e3/Makefile index ca455a7a9f76..218977dad07b 100644 --- a/editors/e3/Makefile +++ b/editors/e3/Makefile @@ -1,20 +1,21 @@ PORTNAME= e3 PORTVERSION= 2.8 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= http://sites.google.com/site/e3editor/Home/ MAINTAINER= ports@FreeBSD.org COMMENT= Full featured text editor written in assembler WWW= http://www.sax.de/~adlibit/ BUILD_DEPENDS= nasm:devel/nasm +ONLY_FOR_ARCHS= i386 USES= gmake tar:tgz MAKE_ARGS= OS=FREEBSD -ONLY_FOR_ARCHS= i386 post-patch: @${REINPLACE_CMD} -e '/SYS_sigaction 46/s/46/342/' ${WRKSRC}/e3.h .include diff --git a/editors/e3/files/patch-Makefile b/editors/e3/files/patch-Makefile index d881e8be2b81..68a99e39938c 100644 --- a/editors/e3/files/patch-Makefile +++ b/editors/e3/files/patch-Makefile @@ -1,43 +1,52 @@ ---- ./Makefile.orig 2010-05-27 14:58:59.000000000 -0400 -+++ ./Makefile 2014-08-05 06:40:07.000000000 -0400 -@@ -7,7 +7,7 @@ +--- Makefile.orig 2010-05-27 18:58:59 UTC ++++ Makefile +@@ -7,7 +7,7 @@ OS=LINUX # 2. edit dest dir prefix if you want.... -PREFIX='/usr/local' +PREFIX?='/usr/local' # 3. for programmers only: debugging in 64 bit Linux DEBUG=false -@@ -43,7 +43,7 @@ +@@ -21,7 +21,7 @@ MANSEC='1' + + BINDIR='$(PREFIX)/bin' + MANSEC='1' +-MANDIR='$(PREFIX)/man/man$(MANSEC)' ++MANDIR='$(PREFIX)/share/man/man$(MANSEC)' + + ASOURCES=e3.asm e3.h + AFLAGS = -w+orphan-labels -f elf +@@ -43,7 +43,7 @@ else chmod +x e3 else echo $(ASVER) - nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) -D$(EXMODE) + nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) ld -s -o e3 e3.o strip --remove-section .comment e3 endif -@@ -71,14 +71,14 @@ +@@ -71,14 +71,14 @@ install: e3 # ------------------------------------------------- install: e3 - install -d $(PREFIX) $(BINDIR) $(MANDIR) - install -m 755 e3 $(BINDIR) - ln -sf $(BINDIR)/e3 $(BINDIR)/e3ws - ln -sf $(BINDIR)/e3 $(BINDIR)/e3em - ln -sf $(BINDIR)/e3 $(BINDIR)/e3pi - ln -sf $(BINDIR)/e3 $(BINDIR)/e3vi - ln -sf $(BINDIR)/e3 $(BINDIR)/e3ne - install -m 644 e3.man $(MANDIR)/e3.$(MANSEC) + install -d $(DESTDIR)$(PREFIX) $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) + ${BSD_INSTALL_PROGRAM} e3 $(DESTDIR)$(BINDIR) + ln -sf e3 $(DESTDIR)$(BINDIR)/e3ws + ln -sf e3 $(DESTDIR)$(BINDIR)/e3em + ln -sf e3 $(DESTDIR)$(BINDIR)/e3pi + ln -sf e3 $(DESTDIR)$(BINDIR)/e3vi + ln -sf e3 $(DESTDIR)$(BINDIR)/e3ne + ${BSD_INSTALL_MAN} e3.man $(DESTDIR)$(MANDIR)/e3.$(MANSEC) clean: rm -f e3*.o e3*.lst e3.tmp e3 e3em e3pi e3vi e3ws e3ne *~ diff --git a/editors/e3/pkg-plist b/editors/e3/pkg-plist index 8e72fbe7305c..b47d1dc1a695 100644 --- a/editors/e3/pkg-plist +++ b/editors/e3/pkg-plist @@ -1,7 +1,7 @@ bin/e3 bin/e3em bin/e3ne bin/e3pi bin/e3vi bin/e3ws -man/man1/e3.1.gz +share/man/man1/e3.1.gz