Index: branches/2020Q2/x11/xforward/files/patch-Makefile
===================================================================
--- branches/2020Q2/x11/xforward/files/patch-Makefile	(revision 535247)
+++ branches/2020Q2/x11/xforward/files/patch-Makefile	(revision 535248)
@@ -1,60 +1,60 @@
 --- Makefile.orig	1993-06-05 02:32:01 UTC
 +++ Makefile
 @@ -18,18 +18,20 @@
  # MANDIR is where the manual page will be installed.
  
  DESTDIR=
 -BINDIR=/usr/local/bin
 -MANDIR=/usr/local/man/man1
 +BINDIR=${PREFIX}/bin
 +MANDIR=${PREFIX}/man/man1
  
  # Where to find things
  # INCFLAGS lists directories to search for header files
  # LDFLAGS lists directories to search for libraries
  # LIBS lists the necessary libraries (Motif, Xt, X11)
  
 -INCFLAGS= -I/usr/lib/DXM/lib -I/usr/lib/DXM/lib/Xt
 -LDFLAGS= -L/usr/lib/DXM/lib/Xm -L/usr/lib/DXM/lib/Xt
 -LIBS= -lXm -lXt -lX11
 +INCFLAGS= -I${LOCALBASE}/include
 +LDFLAGS= -L${LOCALBASE}/lib
 +LIBS= -lXm -lXt -lX11 -lXext
-+LIBS_STATIC= -lXm -lXmu -lXt -lXext -lSM -lICE -lpng16 -lz -lm -ljpeg -lXft -lfontconfig -lexpat -lfreetype -lbz2 -lX11 -lXau -lxcb -lXdmcp -lXau -lXft -lXrender
++LIBS_STATIC= -lXm -lXmu -lXt -lXext -lSM -lICE -lpng16 -lz -lm -ljpeg -lXft -lfontconfig -lexpat -lfreetype -lbz2 -lX11 -lXau -lxcb -lXdmcp -lXau -lXft -lXrender -lXp
  
 +
  CFLAGS= ${INCFLAGS} -O
  
  # For CenterLine CodeCenter
 @@ -39,20 +41,30 @@ SRCS= xforward.c
  AUXFILES= README NOTICE Makefile xforward.1
  
  PROGS = xforward
 +PROGS_STATIC = xforward-static
  
 +all-static: all ${PROGS_STATIC}
 +
  all: ${PROGS}
  
  xforward:	xforward.o
  	cc ${LDFLAGS} xforward.o -o xforward ${LIBS}
  
 +xforward-static:	xforward.o
 +	cc ${LDFLAGS} -static xforward.o -o xforward-static ${LIBS_STATIC}
 +
  xforward.o:	xforward.c
  	cc -c ${CFLAGS} xforward.c
  
  install: ${PROGS}
  	install -c xforward ${DESTDIR}${BINDIR}/xforward
  	install -c xforward.1 ${DESTDIR}${MANDIR}/xforward.1
 +
 +install-static: install ${PROGS_STATIC}
 +	install -c xforward-static ${DESTDIR}${BINDIR}/xforward-static
 +
  clean: 	;
 -	rm -f *~ *.o core ${PROGS}
 +	rm -f *~ *.o core ${PROGS} ${PROGS_STATIC}
  
  center:
  	#load ${LDFLAGS} ${LIBS}
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 535247)
+++ branches/2020Q2	(revision 535248)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r535196