View | Details | Raw Unified | Return to bug 151994
Collapse All | Expand All

(-)editors/2bsd-vi/Makefile (+6 lines)
Lines 15-20 DISTNAME= ex-${PORTVERSION} Link Here
15 
MAINTAINER=	lx@redundancy.redundancy.org
 15 
MAINTAINER=	lx@redundancy.redundancy.org
16 
COMMENT=	The original vi editor, updated to run on modern OSes
 16 
COMMENT=	The original vi editor, updated to run on modern OSes
17 

          17
          

        

            

              
              
              18
              
LICENSE=	BSD

            

            

              19
              
LICENSE_FILE=	${WRKSRC}/LICENSE

            

            

              20
              

            

        

          18
          
USE_BZIP2=	yes

          21
          
USE_BZIP2=	yes

        

        

          19
          

          22
          

        

        

          20
          
PRESERVEDIR=	/var/preserve/${UNIQUENAME}

          23
          
PRESERVEDIR=	/var/preserve/${UNIQUENAME}

        

  

    
      
            Lines 23-28
          PLIST_SUB=	PRESERVEDIR="${PRESERVEDIR}"
      
      
        Link Here
      
    
  

        

          23
          
MAN1=	ex.1 vi.1

          26
          
MAN1=	ex.1 vi.1

        

        

          24
          
MLINKS=	ex.1 edit.1  vi.1 vedit.1  vi.1 view.1

          27
          
MLINKS=	ex.1 edit.1  vi.1 vedit.1  vi.1 view.1

        

        

          25
          

          28
          

        

            

              
              
              29
              
post-extract:	.SILENT

            

            

              30
              
	${RM} -fr ${WRKSRC}/libuxre ${WRKSRC}/regexp.h

            

            

              31
              

            

        

          26
          
post-patch:

          32
          
post-patch:

        

        

          27
          
.for f in Makefile ex.1 expreserve.c exrecover.c vi.1

          33
          
.for f in Makefile ex.1 expreserve.c exrecover.c vi.1

        

        

          28
          
	@${REINPLACE_CMD} -e 's|/var/preserve|${PRESERVEDIR}|' ${WRKSRC}/${f}

          34
          
	@${REINPLACE_CMD} -e 's|/var/preserve|${PRESERVEDIR}|' ${WRKSRC}/${f}

        



(-)editors/2bsd-vi/files/patch-Makefile
      (+19 lines)




  

    
      
            Lines 21-26
          
      
      
        Link Here
      
    
  

        

          21
          
 

          21
          
 

        

        

          22
          
 #

          22
          
 #

        

        

          23
          
 # Compiler and linker flags.

          23
          
 # Compiler and linker flags.

        

            

              
              
              24
              
@@ -161,9 +161,7 @@ FEATURES	= -DLISPCODE -DCHDIR -DFASTTAG 

            

            

              25
              
 # (wchar.h, wctype.h, btowc() etc.) which is not provided by older

            

            

              26
              
 # compilation environments.

            

            

              27
              
 #

            

            

              28
              
-REINC	= -I./libuxre -DUXRE

            

            

              29
              
-RELIB	= -L./libuxre -luxre

            

            

              30
              
-RETGT	= uxre

            

            

              31
              
+REINC	= -DUXRE -DREG_ANGLES=0 -DNO_BE_BACKSLASH

            

            

              32
              
 

            

            

              33
              
 #

            

            

              34
              
 # VMUNIX should be correct for any modern Unix.

            

        

          24
          
@@ -205,13 +204,13 @@ OSTYPE	= -DVMUNIX

          35
          
@@ -205,13 +204,13 @@ OSTYPE	= -DVMUNIX

        

        

          25
          
 #

          36
          
 #

        

        

          26
          
 # You may also get terminfo access by using the ncurses library.

          37
          
 # You may also get terminfo access by using the ncurses library.

        

  

    
      
            Lines 37-42
          
      
      
        Link Here
      
    
  

        

          37
          
 

          48
          
 

        

        

          38
          
 #

          49
          
 #

        

        

          39
          
 # Since ex uses sbrk() internally, a conflict with the libc's version of

          50
          
 # Since ex uses sbrk() internally, a conflict with the libc's version of

        

            

              
              
              51
              
@@ -240,7 +237,6 @@ RECOVER	= -DEXRECOVER=\"$(LIBEXECDIR)/ex

            

            

              52
              
 			-DEXPRESERVE=\"$(LIBEXECDIR)/expreserve\"

            

            

              53
              
 CCFLAGS	= $(CFLAGS) $(WARN) $(CPPFLAGS) $(FEATURES) $(CHARSET) $(OSTYPE) \

            

            

              54
              
 		$(LARGEF) $(RECOVER) $(LANGMSG) $(REINC) $(RPMCFLAGS)

            

            

              55
              
-TLIB	= libterm/libtermlib.a

            

            

              56
              
 INCLUDE	= /usr/include

            

            

              57
              
 OBJS	= ex.o ex_addr.o ex_cmds.o ex_cmds2.o ex_cmdsub.o \

            

            

              58
              
 		ex_data.o ex_extern.o ex_get.o ex_io.o ex_put.o ex_re.o \

            

        

          40
          
@@ -292,13 +291,6 @@

          59
          
@@ -292,13 +291,6 @@

        

        

          41
          
 # install in standard place

          60
          
 # install in standard place

        

        

          42
          
 

          61
          
 

        



(-)editors/2bsd-vi/files/stable-Makefile.patch
      (-15 lines)




  

    
      
          Removed
      
      
        Link Here
      
    
  

            

              1
              
--- /tmp/Makefile	Mon Jul 12 16:26:36 2004

            

            

              2
              
+++ Makefile	Mon Jul 12 16:26:48 2004

            

            

              3
              
@@ -144,9 +144,9 @@

            

            

              4
              
 # advanced multibyte character support etc. which might not be present

            

            

              5
              
 # on your system.

            

            

              6
              
 #

            

            

              7
              
-REINC	= -I./libuxre -DUXRE

            

            

              8
              
-RELIB	= -L./libuxre -luxre

            

            

              9
              
-RETGT	= uxre

            

            

              10
              
+#REINC	= -I./libuxre -DUXRE

            

            

              11
              
+#RELIB	= -L./libuxre -luxre

            

            

              12
              
+#RETGT	= uxre

            

            

              13
              
 

            

            

              14
              
 #

            

            

              15
              
 # These settings should be correct for any modern Unix.

            






  

  Return to bug 151994