pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ee: portability fixes.



Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Sun Jul 17 20:55:58 2022 +0200
Changeset:	90322d63038ca053e348e54428e64b8785336e4b

Modified Files:
	ee/Makefile
	ee/distinfo
	ee/patches/patch-create.make

Log Message:
ee: portability fixes.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=90322d63038ca053e348e54428e64b8785336e4b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ee/Makefile                  | 15 +++++++------
 ee/distinfo                  |  2 +-
 ee/patches/patch-create.make | 51 ++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 59 insertions(+), 9 deletions(-)

diffs:
diff --git a/ee/Makefile b/ee/Makefile
index 1aa4a8ec26..582afaa13e 100644
--- a/ee/Makefile
+++ b/ee/Makefile
@@ -15,15 +15,18 @@ LICENSE=	2-clause-bsd
 USE_TOOLS+=	pkg-config
 USE_NCURSES=	yes     # fixterm()
 
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths+=	Makefile
-SUBST_SED.paths=	-e 's|/usr/local|${DESTDIR}${PREFIX}|g'
-SUBST_MESSAGE.paths=	Fixing installation dirs.
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 WRKSRC=	${WRKDIR}/easyedit-1.5.2
 
+post-configure:
+	cd ${WRKSRC} && ${MAKE:Q} all
+
+INSTALLATION_DIRS=  bin ${PKGMANDIR}/man1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/ee ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/ee.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ee/distinfo b/ee/distinfo
index d85a2e758d..f6eb7a9bc0 100644
--- a/ee/distinfo
+++ b/ee/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
 BLAKE2s (ee-1.5.2/ee-1.5.2.src.tgz) = a8be0743e80ab053ff72e238da2ce66ed80bc494f1aa066cb50eb57ab5a9faf9
 SHA512 (ee-1.5.2/ee-1.5.2.src.tgz) = 9ca0e82d65971b0bce38e09c365b6eb8b81ca6ff5b244107ae254322e47e841e7f5345bf242a0a9dd66b731d46cead6f442016b9e070a1298e1a5319b1d7b97a
 Size (ee-1.5.2/ee-1.5.2.src.tgz) = 69651 bytes
-SHA1 (patch-create.make) = 703e98e869e26e611eed07b4c31b4d24db6428fc
+SHA1 (patch-create.make) = 86f4bce3998da808b11adfbd3934536b49f07081
 SHA1 (patch-ee.c) = 9da740c0bf6720c8b44839a6037d9cdbd7b3ba52
diff --git a/ee/patches/patch-create.make b/ee/patches/patch-create.make
index cfbc584ea0..81ab343496 100644
--- a/ee/patches/patch-create.make
+++ b/ee/patches/patch-create.make
@@ -1,10 +1,57 @@
 $NetBSD$
 
-Link against ncurses.
+Use local ncurses rather then ee's own implementation.
 
 --- create.make.orig	2002-09-23 04:18:30.000000000 +0000
 +++ create.make
-@@ -267,7 +267,7 @@ echo "all :	$TARGET" >> make.local
+@@ -154,35 +154,8 @@ else
+ 	catgets="-DNO_CATGETS"
+ fi
+ 
+-# make decisions about use of new_curse.c (use of new_curse is recommended 
+-# rather than local curses)
+-
+-if [ -n "$terminfo_exists" -a -z "$termcap_exists" ]
+-then
+-	echo "Neither terminfo or termcap are on this system!  "
+-	if [ -f /usr/include/curses.h ]
+-	then
+-		echo "Relying on local curses implementation."
+-	else
+-		cat <<-EOF
+-		Don't know where to find curses, you'll need to modify 
+-		source code to be able to build!
+-		
+-		Modify the file make.default and build ee by typing:
+-		
+-		make -f make.default
+-		
+-		EOF
+-
+-		exit 1
+-	fi
+-	
+-	TARGET="curses"
+-	curses=""
+-else
+-	curses="-DNCURSE"
+-	TARGET="ee"
+-fi
++curses="-DNCURSE"
++TARGET="curses"
+ 
+ if [ -z "$termio" -a -z "$sgtty" ]
+ then
+@@ -205,7 +178,7 @@ then
+ 	fi
+ 	
+ 	TARGET="curses"
+-	curses=""
++	curses="-DNCURSE"
+ fi
+ 
+ # check if this is a SunOS system
+@@ -267,7 +240,7 @@ echo "all :	$TARGET" >> make.local
  cat  >> make.local << EOF
  
  curses :	ee.c


Home | Main Index | Thread Index | Old Index