aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/psgml-emacs/Makefile48
-rw-r--r--editors/psgml-emacs/distinfo2
-rw-r--r--editors/psgml-emacs/files/patch-ad14
-rw-r--r--editors/psgml-emacs/files/patch-ai30
-rw-r--r--editors/psgml-emacs/files/psgml-startup.el.in53
-rw-r--r--editors/psgml-emacs/pkg-descr2
-rw-r--r--editors/psgml-emacs/pkg-plist4
-rw-r--r--editors/psgml-emacs20/pkg-descr4
-rw-r--r--editors/psgml-emacs20/pkg-plist3
-rw-r--r--editors/psgml-mule/Makefile6
-rw-r--r--editors/psgml-mule/pkg-descr2
-rw-r--r--editors/psgml-mule/pkg-plist4
-rw-r--r--editors/psgml-xemacs21-mule/Makefile5
-rw-r--r--editors/psgml-xemacs21-mule/pkg-descr4
-rw-r--r--editors/psgml-xemacs21-mule/pkg-plist3
-rw-r--r--editors/psgml/Makefile48
-rw-r--r--editors/psgml/distinfo2
-rw-r--r--editors/psgml/files/patch-ad14
-rw-r--r--editors/psgml/files/patch-ai30
-rw-r--r--editors/psgml/files/psgml-startup.el.in53
-rw-r--r--editors/psgml/pkg-descr2
-rw-r--r--editors/psgml/pkg-plist4
22 files changed, 257 insertions, 80 deletions
diff --git a/editors/psgml-emacs/Makefile b/editors/psgml-emacs/Makefile
index d5c06d119bb3..15a039a396ec 100644
--- a/editors/psgml-emacs/Makefile
+++ b/editors/psgml-emacs/Makefile
@@ -1,21 +1,21 @@
# New ports collection makefile for: psgml for emacs
-# Version required: 1.1.6
+# Version required: 1.2.0
# Date created: 23 January 1999
# Whom: shige
#
# $FreeBSD$
#
-DISTNAME= psgml-1.1.6
+DISTNAME= psgml-${PSGML_VER}
CATEGORIES= editors elisp
-MASTER_SITES= ftp://ftp.lysator.liu.se/pub/sgml/ALPHA/
+MASTER_SITES= ftp://ftp.lysator.liu.se/pub/sgml/
MAINTAINER= shige@FreeBSD.org
# distfile version
-PSGML_VER= 1.1.6
-PSGML_SETUPEL= psgml-setupel.el
-CATALOG= ${PREFIX}/share/sgml/catalog
+PSGML_VER= 1.2.0
+PSGML_STARTUPEL= psgml-startup.el
+CATALOG= ${PREFIX}/share/sgml/catalog
# This is a master port.
PORTCLASS?= master
@@ -25,16 +25,11 @@ EMACS_NAME= emacs
EMACS_PORT= emacs
EMACS_VER= 19.34
EMACS_LIBDIR= share/${EMACS_NAME}
-REQUIRE_SETUPEL= YES
.endif
# if RUN_DEPENDS emacs port name has the suffix `-common'
-.if !defined(HAVE_COMMON_PORT)
-HAVE_COMMON_PORT= NO
-.endif
-# if RUN_DEPENDS emacs needs setup elisp
-.if !defined(REQUIRE_SETUPEL)
-REQUIRE_SETUPEL= NO
+.if !defined(HAS_COMMON_PORT)
+HAS_COMMON_PORT= NO
.endif
#
@@ -44,17 +39,20 @@ REQUIRE_SETUPEL= NO
PKGNAME= psgml-${EMACS_PORT}-${PSGML_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES")
+.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
.else
RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.endif
+GNU_CONFIGURE= YES
+CONFIGURE_ARGS= --lispdir=${PREFIX}/${EMACS_LIBDIR}/site-lisp/psgml \
+ --infodir=${PREFIX}/info
CONFIGURE_ENV= EMACS=${EMACS_CMD}
MAKE_FLAGS= EMACS=${EMACS_CMD}
-SCRIPTS_ENV= TARGETS="${PSGML_SETUPEL}" \
+SCRIPTS_ENV= TARGETS="${PSGML_STARTUPEL}" \
EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- PSGML_SETUPEL=${PSGML_SETUPEL}
+ PSGML_STARTUPEL=${PSGML_STARTUPEL}
.else
.BEGIN:
@${ECHO} "Error: Bad port."
@@ -63,9 +61,8 @@ PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
.endif
#
-# main configurations
+# DTD catalogs
#
-USE_AUTOCONF= yes
RUN_DEPENDS+= ${CATALOG}:${PORTSDIR}/textproc/dtd-catalogs
pre-configure:
@@ -73,18 +70,15 @@ pre-configure:
for i in psgml.el psgml.texi ; do \
${RM} -f $${i}.in ; \
${MV} $${i} $${i}.in ; \
+ ${CAT} $${i}.in | ${SED} -e "s;@prefix@;${PREFIX};g" > $${i} ; \
done)
-.if (${REQUIRE_SETUPEL} == "YES")
- ${CP} ${FILESDIR}/${PSGML_SETUPEL}.in ${WRKDIR}
-.endif
-
-pre-build:
- @${RM} -f ${WRKSRC}/psgml.info ${WRKSRC}/psgml-api.info
+ ${CP} ${FILESDIR}/${PSGML_STARTUPEL}.in ${WRKDIR}
post-install:
-.if (${REQUIRE_SETUPEL} == "YES")
- @${INSTALL_DATA} ${WRKDIR}/${PSGML_SETUPEL} \
+ @(cd ${WRKSRC} ; \
+ ${MAKE} install-info ; \
+ )
+ @${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
${PREFIX}/${EMACS_LIBDIR}/site-lisp
-.endif
.include <bsd.port.mk>
diff --git a/editors/psgml-emacs/distinfo b/editors/psgml-emacs/distinfo
index 52929d01254d..d78a19bca34d 100644
--- a/editors/psgml-emacs/distinfo
+++ b/editors/psgml-emacs/distinfo
@@ -1 +1 @@
-MD5 (psgml-1.1.6.tar.gz) = 0736a2aee7d41dcfad16140354a929d4
+MD5 (psgml-1.2.0.tar.gz) = a836a2106d7bf10cb075a5156b086a79
diff --git a/editors/psgml-emacs/files/patch-ad b/editors/psgml-emacs/files/patch-ad
index ba3f8cf7f553..2a31b3bf480f 100644
--- a/editors/psgml-emacs/files/patch-ad
+++ b/editors/psgml-emacs/files/patch-ad
@@ -1,6 +1,14 @@
---- Makefile.in.orig Sat Jan 23 20:58:07 1999
-+++ Makefile.in Sat Jan 23 20:58:55 1999
-@@ -81,8 +81,8 @@
+--- Makefile.in.orig Sun Oct 10 23:12:40 1999
++++ Makefile.in Sat Oct 16 20:24:14 1999
+@@ -31,6 +31,7 @@
+ for p in *.elc; do \
+ echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
+ $(INSTALL_DATA) $$p $(lispdir)/$$p; \
++ $(INSTALL_DATA) `echo $$p | sed 's/elc$$/el/'` $(lispdir)/`echo $$p | sed 's/elc$$/el/'` ; \
+ done
+ $(INSTALL_DATA) iso88591.map $(lispdir)
+
+@@ -42,8 +43,8 @@
$(INSTALL_DATA) psgml-api.info $(infodir)
if $(SHELL) -c 'install-info --version' \
>/dev/null 2>&1; then \
diff --git a/editors/psgml-emacs/files/patch-ai b/editors/psgml-emacs/files/patch-ai
new file mode 100644
index 000000000000..27e686bef7d9
--- /dev/null
+++ b/editors/psgml-emacs/files/patch-ai
@@ -0,0 +1,30 @@
+--- configure.orig Sun Oct 10 23:12:40 1999
++++ configure Sat Oct 16 20:02:52 1999
+@@ -73,6 +73,11 @@
+
+ case "$ac_option" in
+
++ -lispdir | --lispdir | --lispdi | --lispd | --lisp)
++ ac_prev=lispdir ;;
++ -lispdir=* | --lispdir=* | --lispdi=* | --lispd=* | --lisp=*)
++ lispdir="$ac_optarg" ;;
++
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+@@ -687,6 +692,7 @@
+ done
+ test -n "$EMACS" || EMACS="no"
+
++if test -z "$lispdir" ; then
+ if test $EMACS != "no"; then
+ echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
+ echo "configure:693: checking where .elc files should go" >&5
+@@ -710,6 +716,7 @@
+ fi
+ echo "$ac_t""$lispdir" 1>&6
+ fi
++fi
+
+ # Extract the first word of "makeinfo", so it can be a program name with args.
+ set dummy makeinfo; ac_word=$2
diff --git a/editors/psgml-emacs/files/psgml-startup.el.in b/editors/psgml-emacs/files/psgml-startup.el.in
new file mode 100644
index 000000000000..1868e53bbb0f
--- /dev/null
+++ b/editors/psgml-emacs/files/psgml-startup.el.in
@@ -0,0 +1,53 @@
+;;
+;; @(#)psgml-startup.el -- psgml startup elisp file.
+;; -- by shige@FreeBSD.ORG
+
+;; setup load-path
+(if (fboundp 'normal-top-level-add-subdirs-to-load-path)
+ (setq load-path (append '(
+ "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/psgml"
+ ) load-path)))
+
+(autoload 'sgml-mode "psgml" "Major mode to edit SGML files." t)
+(autoload 'xml-mode "psgml" "Major mode to edit XML files." t)
+
+(setq sgml-custom-dtd
+ '(("HTML" "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">")
+ ("HTML 2.0" "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">")
+ ("HTML 2.0 Level 1"
+ "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0 Level 1//EN\">")
+ ("HTML 2.0 Level 2"
+ "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0 Level 2//EN\">")
+ ("HTML 2.0 Strict Level 1"
+ "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0 Strict Level 1//EN\">")
+ ("HTML 2.0 Strict Level 2"
+ "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0 Strict Level 2//EN\">")
+ ("HTML 3.2" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">")
+ ("HTML 4.0" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">")
+ ("HTML 4.0 Transitional"
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitioal//EN\">")
+ ("HTML 4.0 Frameset"
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Frameset//EN\">")
+ ("DocBook V2.4.1"
+ "<!DOCTYPE DOCBOOK PUBLIC \"-//Davenport//DTD DocBook V2.4.1//EN\">")
+ ("DocBook V3.0"
+ "<!DOCTYPE DOCBOOK PUBLIC \"-//Davenport//DTD DocBook V3.0//EN\">")
+ ("DocBook V3.1"
+ "<!DOCTYPE DOCBOOK PUBLIC \"-//OASYS//DTD DocBook V3.1//EN\">")
+ ("LINUXDOC"
+ "<!DOCTYPE LINUXDOC PUBLIC \"-//FreeBSD//DTD linuxdoc//EN\">")
+ ("LINUXDOC 1.0"
+ "<!DOCTYPE LINUXDOC PUBLIC \"-//FreeBSD//DTD linuxdoc 1.0//EN\">")
+ ("LINUXDOC 1.1"
+ "<!DOCTYPE LINUXDOC PUBLIC \"-//FreeBSD//DTD linuxdoc 1.1//EN\">")
+ ("Article"
+ "<!DOCTYPE Article PUBLIC \"ISO 12083:1993//DTD Article//EN\">")
+ ("Book"
+ "<!DOCTYPE Book PUBLIC \"ISO 12083:1993//DTD Book//EN\">")
+ ("Mathematics"
+ "<!DOCTYPE Mathematics PUBLIC \"ISO 12083:1993//DTD Mathematics//EN\">")
+ ("Serial"
+ "<!DOCTYPE Serial PUBLIC \"ISO 12083:1993//DTD Serial//EN\">")
+ ))
+
+(provide 'psgml-startup)
diff --git a/editors/psgml-emacs/pkg-descr b/editors/psgml-emacs/pkg-descr
index 77907029eee5..a7d18952ab89 100644
--- a/editors/psgml-emacs/pkg-descr
+++ b/editors/psgml-emacs/pkg-descr
@@ -15,6 +15,6 @@ types and defaults, and structure based editing.
To use psgml, put the following setup into your ~/.emacs:
- (require 'psgml-setupel)
+ (require 'psgml-startup)
--- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/psgml-emacs/pkg-plist b/editors/psgml-emacs/pkg-plist
index 6822a9f06eb8..b0348f120b1f 100644
--- a/editors/psgml-emacs/pkg-plist
+++ b/editors/psgml-emacs/pkg-plist
@@ -1,3 +1,4 @@
+%%EMACS_LIBDIR%%/site-lisp/psgml/iso88591.map
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-charent.el
@@ -8,14 +9,13 @@
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-edit.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.elc
-%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-lucid.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.elc
-%%EMACS_LIBDIR%%/site-lisp/%%PSGML_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/%%PSGML_STARTUPEL%%
@dirrm %%EMACS_LIBDIR%%/site-lisp/psgml
@unexec install-info --delete %D/info/psgml.info %D/info/dir
@unexec install-info --delete %D/info/psgml-api.info %D/info/dir
diff --git a/editors/psgml-emacs20/pkg-descr b/editors/psgml-emacs20/pkg-descr
index 05fd12a91eb1..e95327d78adc 100644
--- a/editors/psgml-emacs20/pkg-descr
+++ b/editors/psgml-emacs20/pkg-descr
@@ -13,4 +13,8 @@ types and defaults, and structure based editing.
PSGML is installed the following directory tree:
${PREFIX}/share/emacs/site-lisp/psgml/
+To use psgml, put the following setup into your ~/.emacs:
+
+ (require 'psgml-startup)
+
--- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/psgml-emacs20/pkg-plist b/editors/psgml-emacs20/pkg-plist
index f99d7073877c..b0348f120b1f 100644
--- a/editors/psgml-emacs20/pkg-plist
+++ b/editors/psgml-emacs20/pkg-plist
@@ -1,3 +1,4 @@
+%%EMACS_LIBDIR%%/site-lisp/psgml/iso88591.map
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-charent.el
@@ -8,13 +9,13 @@
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-edit.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.elc
-%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-lucid.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.elc
+%%EMACS_LIBDIR%%/site-lisp/%%PSGML_STARTUPEL%%
@dirrm %%EMACS_LIBDIR%%/site-lisp/psgml
@unexec install-info --delete %D/info/psgml.info %D/info/dir
@unexec install-info --delete %D/info/psgml-api.info %D/info/dir
diff --git a/editors/psgml-mule/Makefile b/editors/psgml-mule/Makefile
index 693e8f05e47b..9fa35f527792 100644
--- a/editors/psgml-mule/Makefile
+++ b/editors/psgml-mule/Makefile
@@ -1,5 +1,5 @@
# New ports collection makefile for: psgml for mule
-# Version required: 1.1.6
+# Version required: 1.2.0
# Date created: 23 January 1999
# Whom: shige
#
@@ -19,8 +19,8 @@ EMACS_PORT= mule
EMACS_VER= 19.34
EMACS_LIBDIR= share/${EMACS_NAME}
-HAVE_COMMON_PORT= YES
-REQUIRE_SETUPEL= YES
+# whether emacs has a *-common port
+HAS_COMMON_PORT= YES
# pkg/* files are used in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/psgml-mule/pkg-descr b/editors/psgml-mule/pkg-descr
index fdcdbdaab2f0..e57a3f0c0a25 100644
--- a/editors/psgml-mule/pkg-descr
+++ b/editors/psgml-mule/pkg-descr
@@ -15,6 +15,6 @@ types and defaults, and structure based editing.
To use psgml, put the following setup into your ~/.emacs:
- (require 'psgml-setupel)
+ (require 'psgml-startup)
--- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/psgml-mule/pkg-plist b/editors/psgml-mule/pkg-plist
index 6822a9f06eb8..b0348f120b1f 100644
--- a/editors/psgml-mule/pkg-plist
+++ b/editors/psgml-mule/pkg-plist
@@ -1,3 +1,4 @@
+%%EMACS_LIBDIR%%/site-lisp/psgml/iso88591.map
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-charent.el
@@ -8,14 +9,13 @@
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-edit.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.elc
-%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-lucid.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.elc
-%%EMACS_LIBDIR%%/site-lisp/%%PSGML_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/%%PSGML_STARTUPEL%%
@dirrm %%EMACS_LIBDIR%%/site-lisp/psgml
@unexec install-info --delete %D/info/psgml.info %D/info/dir
@unexec install-info --delete %D/info/psgml-api.info %D/info/dir
diff --git a/editors/psgml-xemacs21-mule/Makefile b/editors/psgml-xemacs21-mule/Makefile
index 1a68983e4c17..f2f343552818 100644
--- a/editors/psgml-xemacs21-mule/Makefile
+++ b/editors/psgml-xemacs21-mule/Makefile
@@ -1,5 +1,5 @@
# New ports collection makefile for: psgml for xemacs-mule
-# Version required: 1.1.6
+# Version required: 1.2.0
# Date created: 26 May 1999
# Whom: kuriyama
#
@@ -22,6 +22,7 @@ EMACS_LIBDIR= lib/xemacs
# pkg/* files are used in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
-HAVE_COMMON_PORT= YES
+# whether emacs has a *-common port
+HAS_COMMON_PORT= YES
.include <${MASTERDIR}/Makefile>
diff --git a/editors/psgml-xemacs21-mule/pkg-descr b/editors/psgml-xemacs21-mule/pkg-descr
index e991fddf2503..0977e6956ac7 100644
--- a/editors/psgml-xemacs21-mule/pkg-descr
+++ b/editors/psgml-xemacs21-mule/pkg-descr
@@ -11,10 +11,10 @@ editing of attribute values in a separate window with information about
types and defaults, and structure based editing.
PSGML is installed the following directory tree:
- ${PREFIX}/lib/xemacs-20.4/site-lisp/psgml/
+ ${PREFIX}/lib/xemacs/site-lisp/psgml/
To use psgml, put the following setup into your ~/.emacs:
- (require 'psgml-setupel)
+ (require 'psgml-startup)
--- Porting by shige <shige@FreeBSD.ORG> and kuriyama@FreeBSD.ORG
diff --git a/editors/psgml-xemacs21-mule/pkg-plist b/editors/psgml-xemacs21-mule/pkg-plist
index 1c37ad456a62..5f2a351bacb7 100644
--- a/editors/psgml-xemacs21-mule/pkg-plist
+++ b/editors/psgml-xemacs21-mule/pkg-plist
@@ -1,3 +1,4 @@
+%%EMACS_LIBDIR%%/site-lisp/psgml/iso88591.map
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-charent.el
@@ -10,11 +11,11 @@
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-lucid.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-lucid.elc
-%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.elc
+%%EMACS_LIBDIR%%/site-lisp/%%PSGML_STARTUPEL%%
@dirrm %%EMACS_LIBDIR%%/site-lisp/psgml
@unexec install-info --delete %D/info/psgml.info %D/info/dir
@unexec install-info --delete %D/info/psgml-api.info %D/info/dir
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index d5c06d119bb3..15a039a396ec 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -1,21 +1,21 @@
# New ports collection makefile for: psgml for emacs
-# Version required: 1.1.6
+# Version required: 1.2.0
# Date created: 23 January 1999
# Whom: shige
#
# $FreeBSD$
#
-DISTNAME= psgml-1.1.6
+DISTNAME= psgml-${PSGML_VER}
CATEGORIES= editors elisp
-MASTER_SITES= ftp://ftp.lysator.liu.se/pub/sgml/ALPHA/
+MASTER_SITES= ftp://ftp.lysator.liu.se/pub/sgml/
MAINTAINER= shige@FreeBSD.org
# distfile version
-PSGML_VER= 1.1.6
-PSGML_SETUPEL= psgml-setupel.el
-CATALOG= ${PREFIX}/share/sgml/catalog
+PSGML_VER= 1.2.0
+PSGML_STARTUPEL= psgml-startup.el
+CATALOG= ${PREFIX}/share/sgml/catalog
# This is a master port.
PORTCLASS?= master
@@ -25,16 +25,11 @@ EMACS_NAME= emacs
EMACS_PORT= emacs
EMACS_VER= 19.34
EMACS_LIBDIR= share/${EMACS_NAME}
-REQUIRE_SETUPEL= YES
.endif
# if RUN_DEPENDS emacs port name has the suffix `-common'
-.if !defined(HAVE_COMMON_PORT)
-HAVE_COMMON_PORT= NO
-.endif
-# if RUN_DEPENDS emacs needs setup elisp
-.if !defined(REQUIRE_SETUPEL)
-REQUIRE_SETUPEL= NO
+.if !defined(HAS_COMMON_PORT)
+HAS_COMMON_PORT= NO
.endif
#
@@ -44,17 +39,20 @@ REQUIRE_SETUPEL= NO
PKGNAME= psgml-${EMACS_PORT}-${PSGML_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES")
+.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
.else
RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.endif
+GNU_CONFIGURE= YES
+CONFIGURE_ARGS= --lispdir=${PREFIX}/${EMACS_LIBDIR}/site-lisp/psgml \
+ --infodir=${PREFIX}/info
CONFIGURE_ENV= EMACS=${EMACS_CMD}
MAKE_FLAGS= EMACS=${EMACS_CMD}
-SCRIPTS_ENV= TARGETS="${PSGML_SETUPEL}" \
+SCRIPTS_ENV= TARGETS="${PSGML_STARTUPEL}" \
EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- PSGML_SETUPEL=${PSGML_SETUPEL}
+ PSGML_STARTUPEL=${PSGML_STARTUPEL}
.else
.BEGIN:
@${ECHO} "Error: Bad port."
@@ -63,9 +61,8 @@ PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
.endif
#
-# main configurations
+# DTD catalogs
#
-USE_AUTOCONF= yes
RUN_DEPENDS+= ${CATALOG}:${PORTSDIR}/textproc/dtd-catalogs
pre-configure:
@@ -73,18 +70,15 @@ pre-configure:
for i in psgml.el psgml.texi ; do \
${RM} -f $${i}.in ; \
${MV} $${i} $${i}.in ; \
+ ${CAT} $${i}.in | ${SED} -e "s;@prefix@;${PREFIX};g" > $${i} ; \
done)
-.if (${REQUIRE_SETUPEL} == "YES")
- ${CP} ${FILESDIR}/${PSGML_SETUPEL}.in ${WRKDIR}
-.endif
-
-pre-build:
- @${RM} -f ${WRKSRC}/psgml.info ${WRKSRC}/psgml-api.info
+ ${CP} ${FILESDIR}/${PSGML_STARTUPEL}.in ${WRKDIR}
post-install:
-.if (${REQUIRE_SETUPEL} == "YES")
- @${INSTALL_DATA} ${WRKDIR}/${PSGML_SETUPEL} \
+ @(cd ${WRKSRC} ; \
+ ${MAKE} install-info ; \
+ )
+ @${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
${PREFIX}/${EMACS_LIBDIR}/site-lisp
-.endif
.include <bsd.port.mk>
diff --git a/editors/psgml/distinfo b/editors/psgml/distinfo
index 52929d01254d..d78a19bca34d 100644
--- a/editors/psgml/distinfo
+++ b/editors/psgml/distinfo
@@ -1 +1 @@
-MD5 (psgml-1.1.6.tar.gz) = 0736a2aee7d41dcfad16140354a929d4
+MD5 (psgml-1.2.0.tar.gz) = a836a2106d7bf10cb075a5156b086a79
diff --git a/editors/psgml/files/patch-ad b/editors/psgml/files/patch-ad
index ba3f8cf7f553..2a31b3bf480f 100644
--- a/editors/psgml/files/patch-ad
+++ b/editors/psgml/files/patch-ad
@@ -1,6 +1,14 @@
---- Makefile.in.orig Sat Jan 23 20:58:07 1999
-+++ Makefile.in Sat Jan 23 20:58:55 1999
-@@ -81,8 +81,8 @@
+--- Makefile.in.orig Sun Oct 10 23:12:40 1999
++++ Makefile.in Sat Oct 16 20:24:14 1999
+@@ -31,6 +31,7 @@
+ for p in *.elc; do \
+ echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
+ $(INSTALL_DATA) $$p $(lispdir)/$$p; \
++ $(INSTALL_DATA) `echo $$p | sed 's/elc$$/el/'` $(lispdir)/`echo $$p | sed 's/elc$$/el/'` ; \
+ done
+ $(INSTALL_DATA) iso88591.map $(lispdir)
+
+@@ -42,8 +43,8 @@
$(INSTALL_DATA) psgml-api.info $(infodir)
if $(SHELL) -c 'install-info --version' \
>/dev/null 2>&1; then \
diff --git a/editors/psgml/files/patch-ai b/editors/psgml/files/patch-ai
new file mode 100644
index 000000000000..27e686bef7d9
--- /dev/null
+++ b/editors/psgml/files/patch-ai
@@ -0,0 +1,30 @@
+--- configure.orig Sun Oct 10 23:12:40 1999
++++ configure Sat Oct 16 20:02:52 1999
+@@ -73,6 +73,11 @@
+
+ case "$ac_option" in
+
++ -lispdir | --lispdir | --lispdi | --lispd | --lisp)
++ ac_prev=lispdir ;;
++ -lispdir=* | --lispdir=* | --lispdi=* | --lispd=* | --lisp=*)
++ lispdir="$ac_optarg" ;;
++
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+@@ -687,6 +692,7 @@
+ done
+ test -n "$EMACS" || EMACS="no"
+
++if test -z "$lispdir" ; then
+ if test $EMACS != "no"; then
+ echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
+ echo "configure:693: checking where .elc files should go" >&5
+@@ -710,6 +716,7 @@
+ fi
+ echo "$ac_t""$lispdir" 1>&6
+ fi
++fi
+
+ # Extract the first word of "makeinfo", so it can be a program name with args.
+ set dummy makeinfo; ac_word=$2
diff --git a/editors/psgml/files/psgml-startup.el.in b/editors/psgml/files/psgml-startup.el.in
new file mode 100644
index 000000000000..1868e53bbb0f
--- /dev/null
+++ b/editors/psgml/files/psgml-startup.el.in
@@ -0,0 +1,53 @@
+;;
+;; @(#)psgml-startup.el -- psgml startup elisp file.
+;; -- by shige@FreeBSD.ORG
+
+;; setup load-path
+(if (fboundp 'normal-top-level-add-subdirs-to-load-path)
+ (setq load-path (append '(
+ "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/psgml"
+ ) load-path)))
+
+(autoload 'sgml-mode "psgml" "Major mode to edit SGML files." t)
+(autoload 'xml-mode "psgml" "Major mode to edit XML files." t)
+
+(setq sgml-custom-dtd
+ '(("HTML" "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">")
+ ("HTML 2.0" "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">")
+ ("HTML 2.0 Level 1"
+ "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0 Level 1//EN\">")
+ ("HTML 2.0 Level 2"
+ "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0 Level 2//EN\">")
+ ("HTML 2.0 Strict Level 1"
+ "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0 Strict Level 1//EN\">")
+ ("HTML 2.0 Strict Level 2"
+ "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0 Strict Level 2//EN\">")
+ ("HTML 3.2" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">")
+ ("HTML 4.0" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">")
+ ("HTML 4.0 Transitional"
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitioal//EN\">")
+ ("HTML 4.0 Frameset"
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Frameset//EN\">")
+ ("DocBook V2.4.1"
+ "<!DOCTYPE DOCBOOK PUBLIC \"-//Davenport//DTD DocBook V2.4.1//EN\">")
+ ("DocBook V3.0"
+ "<!DOCTYPE DOCBOOK PUBLIC \"-//Davenport//DTD DocBook V3.0//EN\">")
+ ("DocBook V3.1"
+ "<!DOCTYPE DOCBOOK PUBLIC \"-//OASYS//DTD DocBook V3.1//EN\">")
+ ("LINUXDOC"
+ "<!DOCTYPE LINUXDOC PUBLIC \"-//FreeBSD//DTD linuxdoc//EN\">")
+ ("LINUXDOC 1.0"
+ "<!DOCTYPE LINUXDOC PUBLIC \"-//FreeBSD//DTD linuxdoc 1.0//EN\">")
+ ("LINUXDOC 1.1"
+ "<!DOCTYPE LINUXDOC PUBLIC \"-//FreeBSD//DTD linuxdoc 1.1//EN\">")
+ ("Article"
+ "<!DOCTYPE Article PUBLIC \"ISO 12083:1993//DTD Article//EN\">")
+ ("Book"
+ "<!DOCTYPE Book PUBLIC \"ISO 12083:1993//DTD Book//EN\">")
+ ("Mathematics"
+ "<!DOCTYPE Mathematics PUBLIC \"ISO 12083:1993//DTD Mathematics//EN\">")
+ ("Serial"
+ "<!DOCTYPE Serial PUBLIC \"ISO 12083:1993//DTD Serial//EN\">")
+ ))
+
+(provide 'psgml-startup)
diff --git a/editors/psgml/pkg-descr b/editors/psgml/pkg-descr
index 77907029eee5..a7d18952ab89 100644
--- a/editors/psgml/pkg-descr
+++ b/editors/psgml/pkg-descr
@@ -15,6 +15,6 @@ types and defaults, and structure based editing.
To use psgml, put the following setup into your ~/.emacs:
- (require 'psgml-setupel)
+ (require 'psgml-startup)
--- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/psgml/pkg-plist b/editors/psgml/pkg-plist
index 6822a9f06eb8..b0348f120b1f 100644
--- a/editors/psgml/pkg-plist
+++ b/editors/psgml/pkg-plist
@@ -1,3 +1,4 @@
+%%EMACS_LIBDIR%%/site-lisp/psgml/iso88591.map
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-charent.el
@@ -8,14 +9,13 @@
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-edit.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.elc
-%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-lucid.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.elc
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.el
%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.elc
-%%EMACS_LIBDIR%%/site-lisp/%%PSGML_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/%%PSGML_STARTUPEL%%
@dirrm %%EMACS_LIBDIR%%/site-lisp/psgml
@unexec install-info --delete %D/info/psgml.info %D/info/dir
@unexec install-info --delete %D/info/psgml-api.info %D/info/dir
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 04:08:04 +0000