head	1.6;
access;
symbols
	pkgsrc-2026Q1:1.6.0.72
	pkgsrc-2026Q1-base:1.6
	pkgsrc-2025Q4:1.6.0.70
	pkgsrc-2025Q4-base:1.6
	pkgsrc-2025Q3:1.6.0.68
	pkgsrc-2025Q3-base:1.6
	pkgsrc-2025Q2:1.6.0.66
	pkgsrc-2025Q2-base:1.6
	pkgsrc-2025Q1:1.6.0.64
	pkgsrc-2025Q1-base:1.6
	pkgsrc-2024Q4:1.6.0.62
	pkgsrc-2024Q4-base:1.6
	pkgsrc-2024Q3:1.6.0.60
	pkgsrc-2024Q3-base:1.6
	pkgsrc-2024Q2:1.6.0.58
	pkgsrc-2024Q2-base:1.6
	pkgsrc-2024Q1:1.6.0.56
	pkgsrc-2024Q1-base:1.6
	pkgsrc-2023Q4:1.6.0.54
	pkgsrc-2023Q4-base:1.6
	pkgsrc-2023Q3:1.6.0.52
	pkgsrc-2023Q3-base:1.6
	pkgsrc-2023Q2:1.6.0.50
	pkgsrc-2023Q2-base:1.6
	pkgsrc-2023Q1:1.6.0.48
	pkgsrc-2023Q1-base:1.6
	pkgsrc-2022Q4:1.6.0.46
	pkgsrc-2022Q4-base:1.6
	pkgsrc-2022Q3:1.6.0.44
	pkgsrc-2022Q3-base:1.6
	pkgsrc-2022Q2:1.6.0.42
	pkgsrc-2022Q2-base:1.6
	pkgsrc-2022Q1:1.6.0.40
	pkgsrc-2022Q1-base:1.6
	pkgsrc-2021Q4:1.6.0.38
	pkgsrc-2021Q4-base:1.6
	pkgsrc-2021Q3:1.6.0.36
	pkgsrc-2021Q3-base:1.6
	pkgsrc-2021Q2:1.6.0.34
	pkgsrc-2021Q2-base:1.6
	pkgsrc-2021Q1:1.6.0.32
	pkgsrc-2021Q1-base:1.6
	pkgsrc-2020Q4:1.6.0.30
	pkgsrc-2020Q4-base:1.6
	pkgsrc-2020Q3:1.6.0.28
	pkgsrc-2020Q3-base:1.6
	pkgsrc-2020Q2:1.6.0.24
	pkgsrc-2020Q2-base:1.6
	pkgsrc-2020Q1:1.6.0.4
	pkgsrc-2020Q1-base:1.6
	pkgsrc-2019Q4:1.6.0.26
	pkgsrc-2019Q4-base:1.6
	pkgsrc-2019Q3:1.6.0.22
	pkgsrc-2019Q3-base:1.6
	pkgsrc-2019Q2:1.6.0.20
	pkgsrc-2019Q2-base:1.6
	pkgsrc-2019Q1:1.6.0.18
	pkgsrc-2019Q1-base:1.6
	pkgsrc-2018Q4:1.6.0.16
	pkgsrc-2018Q4-base:1.6
	pkgsrc-2018Q3:1.6.0.14
	pkgsrc-2018Q3-base:1.6
	pkgsrc-2018Q2:1.6.0.12
	pkgsrc-2018Q2-base:1.6
	pkgsrc-2018Q1:1.6.0.10
	pkgsrc-2018Q1-base:1.6
	pkgsrc-2017Q4:1.6.0.8
	pkgsrc-2017Q4-base:1.6
	pkgsrc-2017Q3:1.6.0.6
	pkgsrc-2017Q3-base:1.6
	pkgsrc-2017Q2:1.6.0.2
	pkgsrc-2017Q2-base:1.6
	pkgsrc-2017Q1:1.5.0.10
	pkgsrc-2017Q1-base:1.5
	pkgsrc-2016Q4:1.5.0.8
	pkgsrc-2016Q4-base:1.5
	pkgsrc-2016Q3:1.5.0.6
	pkgsrc-2016Q3-base:1.5
	pkgsrc-2016Q2:1.5.0.4
	pkgsrc-2016Q2-base:1.5
	pkgsrc-2016Q1:1.5.0.2
	pkgsrc-2016Q1-base:1.5
	pkgsrc-2015Q4:1.4.0.18
	pkgsrc-2015Q4-base:1.4
	pkgsrc-2015Q3:1.4.0.16
	pkgsrc-2015Q3-base:1.4
	pkgsrc-2015Q2:1.4.0.14
	pkgsrc-2015Q2-base:1.4
	pkgsrc-2015Q1:1.4.0.12
	pkgsrc-2015Q1-base:1.4
	pkgsrc-2014Q4:1.4.0.10
	pkgsrc-2014Q4-base:1.4
	pkgsrc-2014Q3:1.4.0.8
	pkgsrc-2014Q3-base:1.4
	pkgsrc-2014Q2:1.4.0.6
	pkgsrc-2014Q2-base:1.4
	pkgsrc-2014Q1:1.4.0.4
	pkgsrc-2014Q1-base:1.4
	pkgsrc-2013Q4:1.4.0.2
	pkgsrc-2013Q4-base:1.4
	pkgsrc-2013Q3:1.3.0.48
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.46
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.44
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.42
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.40
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.38
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.36
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.34
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.32
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.30
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.28
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.26
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.3.0.24
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.22
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.20
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.18
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.3.0.16
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.14
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.12
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.10
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.8
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.6
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.4
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.2
	pkgsrc-2008Q1:1.2.0.34
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.32
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.30
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.28
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.26
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.24
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.22
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.20
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.18
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.16
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.14
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.12
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.10
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.8
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.6
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.4
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.2
	pkgsrc-2004Q1-base:1.2;
locks; strict;
comment	@# @;


1.6
date	2017.04.21.13.03.08;	author jperkin;	state Exp;
branches;
next	1.5;
commitid	gf42xrPl4DljZoOz;

1.5
date	2015.12.29.04.22.33;	author dholland;	state Exp;
branches
	1.5.10.1;
next	1.4;
commitid	T9QYuwfj8SHjvNOy;

1.4
date	2013.10.20.18.15.32;	author joerg;	state Exp;
branches;
next	1.3;
commitid	W6mFBoatGmInP3ax;

1.3
date	2008.04.22.16.23.57;	author jlam;	state Exp;
branches;
next	1.2;

1.2
date	2004.01.21.17.43.55;	author recht;	state Exp;
branches;
next	1.1;

1.1
date	2004.01.21.10.11.19;	author recht;	state Exp;
branches;
next	;

1.5.10.1
date	2017.05.01.08.48.09;	author bsiegert;	state Exp;
branches;
next	;
commitid	kgi7IMCtwzzVfFPz;


desc
@@


1.6
log
@Honour LDFLAGS.
@
text
@$NetBSD: patch-ab,v 1.5 2015/12/29 04:22:33 dholland Exp $

 - Support passing sysconfdir as a configure option.
 - Honor COMPILER_RPATH_FLAG.
 - Use pkgconfig to find freetype.

--- configure.orig	2003-10-21 02:32:25.000000000 +0000
+++ configure
@@@@ -27,6 +27,7 @@@@ GUI_GNOME=bug
 #	 --bindir=DIR		where to install the executables
 #	 --datadir=DIR		where to install the supporting data files
 #	 --docdir=DIR		where to install the :help files & other docs
+#	 --sysconfdir=DIR	where to install the configuration files
 #	 --prefix=DIR		like --bindir=DIR/bin --datadir=DIR/lib/elvis
 #	 --ioctl=VARIETY	type of tty ioctl to use: termios, termio, sgtty
 #	 --verbose		explain each decision
@@@@ -66,6 +67,7 @@@@ PREFIX=/usr
 BINDIR='$(PREFIX)/bin'
 DATADIR='$(PREFIX)/share/elvis/'
 DOCDIR='$(PREFIX)/share/elvis/doc/'
+SYSCONFDIR='/etc/elvis'
 SYS=""
 DEFAULT_CC="cc -O"
 IOCTL=""
@@@@ -130,6 +132,7 @@@@ usage()
 	echo "       --x-libraries=DIR  add DIR to path for X-windows libraries"
 	echo "       --bindir=DIR       where to install the executables"
 	echo "       --datadir=DIR      where to install the supporting data files"
+	echo "       --sysconfdir=DIR   where to install the configuration files"
 	echo "       --prefix=DIR       like --bindir=DIR/bin --datadir=DIR/share/elvis"
 	echo "       --libs=STRING      non-X11 part of the LIBS= string in Makefile"
 	echo "       --ioctl=VARIETY    type of tty ioctl to use: termios, termio, or sgtty"
@@@@ -157,14 +160,6 @@@@ do
 		GUI_GNOME=define
 		args="$args --with-gnome"
 		;;
-	  --with-x=no|--without-x)
-		GUI_X11=undef
-		args="$args --with-x=no"
-		;;
-	  --with-x*)
-		GUI_X11=define
-		args="$args --with-x"
-		;;
 	  --with-xft=no|--without-xft)
 		FEATURE_XFT=undef
 		args="$args --with-xft=no"
@@@@ -173,6 +168,14 @@@@ do
 		FEATURE_XFT=define
 		args="$args --with-xft"
 		;;
+	  --with-x=no|--without-x)
+		GUI_X11=undef
+		args="$args --with-x=no"
+		;;
+	  --with-x*)
+		GUI_X11=define
+		args="$args --with-x"
+		;;
 	  --with-gcc=no|--without-gcc)
 		gnu=n
 		forcegcc=n
@@@@ -203,6 +206,10 @@@@ do
 		DOCDIR=`echo "$i"|sed 's/^--docdir=//'`
 		args="$args $i"
 		;;
+	  --sysconfdir=*)
+		SYSCONFDIR=`echo "$i"|sed 's/^--sysconfdir=//'`
+		args="$args $i"
+		;;
 	  --prefix=*)
 		PREFIX=`echo "$i"|sed 's/^--prefix=//'`
 		args="$args $i"
@@@@ -726,7 +733,7 @@@@ case "$SYS" in
 	if [ "$GUI_X11" = "define" ]
 	then
 		xlibdir=`dirname "$xlib"`
-		XLIBS=" -R$xlibdir$XLIBS"
+		XLIBS=" ${COMPILER_RPATH_FLAG}$xlibdir$XLIBS"
 	fi
 	if [ -f /usr/ccs/lib/libtermcap.a ]
 	then
@@@@ -804,7 +811,7 @@@@ case "$SYS" in
 	if [ "$GUI_X11" = "define" ]
 	then
 		xlibdir=`dirname "$xlib"`
-		XLIBS=" -R$xlibdir$XLIBS"
+		XLIBS=" ${COMPILER_RPATH_FLAG}$xlibdir$XLIBS"
 	fi
 	;;
 
@@@@ -886,6 +893,7 @@@@ echo "Compiler: $CC"
 echo "Bin dir:  "`echo "$BINDIR" |sed s,'$(PREFIX)',"$PREFIX",`
 echo "Data dir: "`echo "$DATADIR"|sed s,'$(PREFIX)',"$PREFIX",`
 echo "Doc dir:  "`echo "$DOCDIR" |sed s,'$(PREFIX)',"$PREFIX",`
+echo "Conf dir: "`echo "$SYSCONFDIR"|sed s,'$(PREFIX)',"$PREFIX",`
 echo "Man dir:  "`sh instman.sh -d -p"${PREFIX}"`
 [ "$WHY" ] || echo "To see details, run \"configure --verbose\""
 
@@@@ -905,11 +913,8 @@@@ if [ "$GUI_X11" = "define" ]
 then
 	case "$FEATURE_XFT" in
 	  define)
-		xft="-lXft "
-		if [ -d /usr/include/freetype2 ]
-		then
-			CC="$CC -I/usr/include/freetype2"
-		fi
+		xft="`pkg-config --libs freetype2 xft` "
+		CC="$CC `pkg-config --cflags freetype2 xft`"
 		;;
 	  *)	
 		xft=""
@@@@ -950,7 +955,7 @@@@ esac
 
 
 # Generate the "config.h" file
-ELVISPATH=`echo "~/.elvis:/etc/elvis:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
+ELVISPATH=`echo "~/.elvis:$SYSCONFDIR:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
 cat >config.h <<eof-config
 /* config.h */
 
@@@@ -1195,11 +1200,12 @@@@ eof-generic
 
 esac
 cat >>$tmp <<eof-all
-s!^LIBS=.*!LIBS=$GNOMELIBS $XLIBS $LIBS!
+s!^LIBS=.*!LIBS=$LDFLAGS $GNOMELIBS $XLIBS $LIBS!
 s!^PREFIX=.*!PREFIX=$PREFIX!
 s!^BINDIR=.*!BINDIR=$BINDIR!
 s!^DATADIR=.*!DATADIR=$DATADIR!
 s!^DOCDIR=.*!DOCDIR=$DOCDIR!
+s!^SYSCONFDIR=.*!SYSCONFDIR=$SYSCONFDIR!
 eof-all
 if [ -d /usr/local/X11/include ]
 then
@


1.5
log
@Add patch comments.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.4 2013/10/20 18:15:32 joerg Exp $
d7 1
a7 1
--- configure.orig	2003-10-20 22:32:25.000000000 -0400
d123 7
a129 1
@@@@ -1200,6 +1205,7 @@@@ s!^PREFIX=.*!PREFIX=$PREFIX!
@


1.5.10.1
log
@Pullup ticket #5341 - requested by sevan
editors/elvis: build fix

Revisions pulled up:
- editors/elvis/distinfo                                        1.13
- editors/elvis/patches/patch-ab                                1.6

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Fri Apr 21 13:03:08 UTC 2017

   Modified Files:
           pkgsrc/editors/elvis: distinfo
           pkgsrc/editors/elvis/patches: patch-ab

   Log Message:
   Honour LDFLAGS.
@
text
@d1 1
a1 1
$NetBSD$
d7 1
a7 1
--- configure.orig	2003-10-21 02:32:25.000000000 +0000
d123 1
a123 7
@@@@ -1195,11 +1200,12 @@@@ eof-generic
 
 esac
 cat >>$tmp <<eof-all
-s!^LIBS=.*!LIBS=$GNOMELIBS $XLIBS $LIBS!
+s!^LIBS=.*!LIBS=$LDFLAGS $GNOMELIBS $XLIBS $LIBS!
 s!^PREFIX=.*!PREFIX=$PREFIX!
@


1.4
log
@Fix rpath options.
@
text
@d1 5
a5 1
$NetBSD: patch-ab,v 1.3 2008/04/22 16:23:57 jlam Exp $
@


1.3
log
@Restructure the following packages:

	editors/elvis
	editors/elvis-x11

The latter is now just editors/elvis built with a specific set of
options.  Changes include:

+ Add options.mk that supports a new "x11" option.

+ Remove Makefile.common and move all logic into elvis/Makefile and
  elvis/options.mk.

+ Rename PLIST.common to PLIST as there are no PLIST differences
  between elvis and elvis-x11.

+ Modify patch-ab to add a --sysconfdir option to the configure script
  and fix the parsing of --with-x* options so that --with-xft isn't
  ignored.

+ Modify patch-ac to handle SYSCONFDIR in Makefile.in passed in from the
  configure script.

+ Remove the unnecessary substitution for PKG_SYSCONFDIR now that the
  configure script and Makefile.in directly support --sysconfdir.

+ Include termcap.buildlink3.mk to properly deal with termcap/curses
  issues (elvis needs termcap).

+ Add full DESTDIR support.

+ Set HOMEPAGE to the correct URL.

+ Bump the PKGREVISION for elvis and elvis-x11 to 6.  Both packages
  now track and use the same PKGREVISION number.
@
text
@d1 1
a1 1
$NetBSD$
d70 18
@


1.2
log
@Fix a build/linking problem wrt Xft2.
Reported by Peter Bex.
@
text
@d3 76
a78 3
--- configure.orig	2003-10-21 04:32:25.000000000 +0200
+++ configure	2004-01-21 18:22:46.000000000 +0100
@@@@ -905,11 +905,8 @@@@
d92 1
a92 1
@@@@ -950,7 +947,7 @@@@
d97 1
a97 1
+ELVISPATH=`echo "~/.elvis:@@PKG_SYSCONFDIR@@:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
d101 8
@


1.1
log
@Add patches which I forgot in the previous commit.
@
text
@d3 17
a19 3
--- configure.orig	2004-01-20 23:11:37.000000000 +0100
+++ configure	2004-01-20 23:11:54.000000000 +0100
@@@@ -950,7 +950,7 @@@@
@