pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/editors/ce
Module Name: pkgsrc
Committed By: schmonz
Date: Thu Nov 3 14:34:02 UTC 2022
Modified Files:
pkgsrc/editors/ce: Makefile PLIST distinfo
Added Files:
pkgsrc/editors/ce: options.mk
pkgsrc/editors/ce/patches: patch-Makefile.in patch-teach-ce.in
Removed Files:
pkgsrc/editors/ce: Makefile.common
pkgsrc/editors/ce/patches: patch-aa patch-ab
Log Message:
Update to 4.8. No changelog. From the diffs:
- Update maintainer email address
- Regenerate with Autoconf 2.61
- Remove --with-purify configure option
- Remove old malloc
- Improve build system
- Remove TODO
- Sprinkle missing return types
- Fix bugs
pkgsrc changes:
- Specify license
- Merge ce-doc (always installed) and ce-x11 (with the 'x11' option)
into this package
- Remove MAKE_JOBS_SAFE=no (seems fine)
- Comment patches and modernize patch filenames
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/editors/ce/Makefile
cvs rdiff -u -r1.17 -r0 pkgsrc/editors/ce/Makefile.common
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/editors/ce/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/editors/ce/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/ce/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/ce/patches/patch-Makefile.in \
pkgsrc/editors/ce/patches/patch-teach-ce.in
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/ce/patches/patch-aa
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/ce/patches/patch-ab
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/editors/ce/Makefile
diff -u pkgsrc/editors/ce/Makefile:1.22 pkgsrc/editors/ce/Makefile:1.23
--- pkgsrc/editors/ce/Makefile:1.22 Thu Oct 9 14:06:32 2014
+++ pkgsrc/editors/ce/Makefile Thu Nov 3 14:34:02 2022
@@ -1,20 +1,35 @@
-# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:32 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.23 2022/11/03 14:34:02 schmonz Exp $
-.include "Makefile.common"
+DISTNAME= ce-${VERSION}
+VERSION= 4.8
+CATEGORIES= editors
+MASTER_SITES= ftp://ftp.cwru.edu/pub/chet/
+MASTER_SITES+= ${HOMEPAGE}dist/
+
+MAINTAINER= schmonz%NetBSD.org@localhost
+HOMEPAGE= http://tiswww.case.edu/php/chet/
+COMMENT= Chet's Emacs: small, fast emacs-like editor
+LICENSE= public-domain AND trn-license
+
+CONFLICTS+= ce-doc<=4.6
+CONFLICTS+= ce-x11<=4.6
+
+GNU_CONFIGURE= yes
+GNU_CONFIGURE_LIBDIR= ${PREFIX}/share/doc
+CONFIGURE_ARGS+= --without-ce-malloc
+
+#BUILD_TARGET= ce
+INSTALL_TARGET= all-install
+
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/ce
+
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_FILES.paths= teach-ce.in
+SUBST_VARS.paths= LN
+SUBST_SED.paths+= -e '1s,/bin/bash,'${SH:Q}','
-PKGREVISION= 1
-COMMENT+= , tty version
-
-REPLACE_INTERPRETER+= bash
-REPLACE.bash.old= .*/bin/bash
-REPLACE.bash.new= ${SH}
-REPLACE_FILES.bash= teach-ce.in
-
-BUILD_TARGET= ce
-INSTALL_TARGET= install man-install
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+.include "options.mk"
.include "../../mk/termcap.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/ce/PLIST
diff -u pkgsrc/editors/ce/PLIST:1.1.1.1 pkgsrc/editors/ce/PLIST:1.2
--- pkgsrc/editors/ce/PLIST:1.1.1.1 Mon Apr 8 19:59:08 2002
+++ pkgsrc/editors/ce/PLIST Thu Nov 3 14:34:02 2022
@@ -1,3 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/08 19:59:08 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/11/03 14:34:02 schmonz Exp $
bin/ce
+bin/teach-ce
+${PLIST.x11}bin/xce
man/man1/ce.1
+${PLIST.x11}man/man1/xce.1
+share/doc/ce/FUNCTIONS
+share/doc/ce/TUTORIAL
+share/doc/ce/ce.help
Index: pkgsrc/editors/ce/distinfo
diff -u pkgsrc/editors/ce/distinfo:1.11 pkgsrc/editors/ce/distinfo:1.12
--- pkgsrc/editors/ce/distinfo:1.11 Tue Oct 26 10:21:25 2021
+++ pkgsrc/editors/ce/distinfo Thu Nov 3 14:34:02 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:21:25 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/11/03 14:34:02 schmonz Exp $
-BLAKE2s (ce-4.6.tar.gz) = befa56dd455ecc536da8d9b7fe448c9d9e4277435b83b5edd4f385cb7213dce2
-SHA512 (ce-4.6.tar.gz) = 7555f54ff12249b147d0a57257ad21ed085535e3b9ab6a65f5a70985f49f28e66026d2130c5800aac7dc5a58a3b039c3bd7288c5b9d3f8c0cf28be565f73c0f5
-Size (ce-4.6.tar.gz) = 287489 bytes
-SHA1 (patch-aa) = 4d41f468071052a968c1547122a0639e56d4551f
-SHA1 (patch-ab) = d41e4ece57025fe0c65a7897e55e34b51717f659
+BLAKE2s (ce-4.8.tar.gz) = ae1950ce08aaf4e5e294cedfe935541e081f84c64720bce2bbbfabb7693e8c15
+SHA512 (ce-4.8.tar.gz) = 5481b3091ca2e799b592aaec5b05657a6b9546749d3311bd824e9e54df72adf8f41443bc4dcc8d84a6065448fefcc8ebae8c86203bb0fb9ec969a31367ceaa01
+Size (ce-4.8.tar.gz) = 354953 bytes
+SHA1 (patch-aa) = 84383dc89354835380c5fb968f062c1d7fdafcab
+SHA1 (patch-ab) = 044cc6137c7402e685ebfacfbd51eba55cec46b9
Added files:
Index: pkgsrc/editors/ce/options.mk
diff -u /dev/null pkgsrc/editors/ce/options.mk:1.1
--- /dev/null Thu Nov 3 14:34:02 2022
+++ pkgsrc/editors/ce/options.mk Thu Nov 3 14:34:02 2022
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2022/11/03 14:34:02 schmonz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.ce
+PKG_SUPPORTED_OPTIONS+= x11
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= x11
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11= yes
+BUILDLINK_DEPMETHOD.libXt?= build
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.endif
Index: pkgsrc/editors/ce/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/editors/ce/patches/patch-Makefile.in:1.1
--- /dev/null Thu Nov 3 14:34:02 2022
+++ pkgsrc/editors/ce/patches/patch-Makefile.in Thu Nov 3 14:34:02 2022
@@ -0,0 +1,49 @@
+$NetBSD: patch-Makefile.in,v 1.1 2022/11/03 14:34:02 schmonz Exp $
+
+Support DESTDIR and 'x11' option.
+
+--- Makefile.in.orig 2020-01-07 19:17:43
++++ Makefile.in
+@@ -94,11 +94,11 @@ LINTFLAGS= -chx
+ -DXCEVERSION='"$(XCEVERSION)"' -DHOSTINFO='"$(OS)"'
+
+ LINTFLAGS= -chx
+-DESTDIR= $(bindir)
+-MANDIR= $(man1dir)
++BINDIR= ${DESTDIR}$(bindir)
++MANDIR= ${DESTDIR}$(man1dir)
+
+ # DOCDIR must agree with the definition for LIBDIR in the source (see ce.h)
+-DOCDIR= $(libdir)/ce
++DOCDIR= ${DESTDIR}$(libdir)/ce
+
+ CFILES= basic.c bind.c buffer.c bug.c cinfo.c cmode.c \
+ complete.c dir.c display.c file.c fileio.c fio.c func.c \
+@@ -249,13 +249,11 @@ install: ${PROG} ${XPROG} installdirs
+ @${SHELL} $(SUPPORT_SRC)/mkdirs $(DOCDIR)
+
+ install: ${PROG} ${XPROG} installdirs
+- -$(MV) ${DESTDIR}/${PROG} ${DESTDIR}/${PROG}.${OLDEXT}
+- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)/${PROG}
++ $(INSTALL_PROGRAM) $(PROG) $(BINDIR)/${PROG}
+ @-if test "X$(XPROG)" != "X" ; then \
+- $(MV) ${DESTDIR}/${XPROG} ${DESTDIR}/${XPROG}.${OLDEXT}; \
+- $(INSTALL_PROGRAM) $(XPROG) $(DESTDIR)/${XPROG}; \
++ $(INSTALL_PROGRAM) $(XPROG) $(BINDIR)/${XPROG}; \
+ fi
+- $(INSTALL_SCRIPT) $(TEACHCE) $(DESTDIR)/$(TEACHCE)
++ $(INSTALL_SCRIPT) $(TEACHCE) $(BINDIR)/$(TEACHCE)
+
+ install-strip:
+ $(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
+@@ -268,7 +266,9 @@ man-install: installdirs
+
+ man-install: installdirs
+ ${INSTALL_DATA} ${DOC_SRC}/ce.1 $(MANDIR)/ce.1
+- ${INSTALL_DATA} ${DOC_SRC}/xce.1 $(MANDIR)/xce.1
++ @-if test "X$(XPROG)" != "X" ; then \
++ ${INSTALL_DATA} ${DOC_SRC}/xce.1 $(MANDIR)/xce.1; \
++ fi
+
+ all-install: install doc-install man-install
+
Index: pkgsrc/editors/ce/patches/patch-teach-ce.in
diff -u /dev/null pkgsrc/editors/ce/patches/patch-teach-ce.in:1.1
--- /dev/null Thu Nov 3 14:34:02 2022
+++ pkgsrc/editors/ce/patches/patch-teach-ce.in Thu Nov 3 14:34:02 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-teach-ce.in,v 1.1 2022/11/03 14:34:02 schmonz Exp $
+
+Substitute pkgsrc's best ${LN} for the platform.
+
+--- teach-ce.in.orig 1999-03-30 17:56:24
++++ teach-ce.in
+@@ -34,7 +34,7 @@ export PATH
+
+ export PATH
+
+-LN="ln -s"
++LN="@LN@ -s"
+
+ TUTORIAL=@libdir@/ce/TUTORIAL
+ CE="@bindir@/ce"
Home |
Main Index |
Thread Index |
Old Index