diff --git a/editors/psgml-emacs/Makefile b/editors/psgml-emacs/Makefile index 7bca000e293a..47f5d740abd5 100644 --- a/editors/psgml-emacs/Makefile +++ b/editors/psgml-emacs/Makefile @@ -3,7 +3,7 @@ # Date created: 23 January 1999 # Whom: shige # -# $Id: Makefile,v 1.2 1999/02/26 18:56:07 shige Exp $ +# $Id: Makefile,v 1.3 1999/03/01 09:18:27 shige Exp $ # DISTNAME= psgml-1.1.6 @@ -14,9 +14,8 @@ MAINTAINER?= shige@FreeBSD.ORG # distfile version PSGML_VER= 1.1.6 -PSGML_SETUPEL= psgml-setup.el +PSGML_SETUPEL= psgml-setupel.el CATALOG= ${PREFIX}/share/sgml/catalog -INFILES= ${PSGML_SETUPEL} # This is a master port. PORTCLASS?= master @@ -52,9 +51,10 @@ RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} .endif CONFIGURE_ENV= EMACS=${EMACS_CMD} MAKE_FLAGS= EMACS=${EMACS_CMD} -SCRIPTS_ENV= INFILES=${INFILES} \ +SCRIPTS_ENV= TARGETS="${PSGML_SETUPEL}" \ EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} -PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} +PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ + PSGML_SETUPEL=${PSGML_SETUPEL} .else .BEGIN: @${ECHO} "Error: Bad port." diff --git a/editors/psgml-emacs/pkg-descr b/editors/psgml-emacs/pkg-descr index 12d6fa3be978..58efc7bcf6b3 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 'psml-setup) + (require 'psml-setupel) --- Porting by shige . diff --git a/editors/psgml-emacs/pkg-plist b/editors/psgml-emacs/pkg-plist index 74a376a96c5f..d7b1b23628d6 100644 --- a/editors/psgml-emacs/pkg-plist +++ b/editors/psgml-emacs/pkg-plist @@ -15,7 +15,7 @@ %%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-setup.el +%%EMACS_LIBDIR%%/site-lisp/%%PSGML_SETUPEL%% @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-emacs/scripts/configure b/editors/psgml-emacs/scripts/configure index 2feca2181bea..ecb50ff2751f 100644 --- a/editors/psgml-emacs/scripts/configure +++ b/editors/psgml-emacs/scripts/configure @@ -1,7 +1,5 @@ #!/bin/sh -TARGETS=${INFILES} - for i in ${TARGETS} do if [ -f ${WRKDIR}/${i}.in ]; then diff --git a/editors/psgml-mule/pkg-descr b/editors/psgml-mule/pkg-descr index 0bc9708621d2..e3ee80f9c126 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 'psml-setup) + (require 'psml-setupel) --- Porting by shige . diff --git a/editors/psgml-mule/pkg-plist b/editors/psgml-mule/pkg-plist index 5b35bd905856..d7b1b23628d6 100644 --- a/editors/psgml-mule/pkg-plist +++ b/editors/psgml-mule/pkg-plist @@ -15,6 +15,7 @@ %%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%% @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 7bca000e293a..47f5d740abd5 100644 --- a/editors/psgml/Makefile +++ b/editors/psgml/Makefile @@ -3,7 +3,7 @@ # Date created: 23 January 1999 # Whom: shige # -# $Id: Makefile,v 1.2 1999/02/26 18:56:07 shige Exp $ +# $Id: Makefile,v 1.3 1999/03/01 09:18:27 shige Exp $ # DISTNAME= psgml-1.1.6 @@ -14,9 +14,8 @@ MAINTAINER?= shige@FreeBSD.ORG # distfile version PSGML_VER= 1.1.6 -PSGML_SETUPEL= psgml-setup.el +PSGML_SETUPEL= psgml-setupel.el CATALOG= ${PREFIX}/share/sgml/catalog -INFILES= ${PSGML_SETUPEL} # This is a master port. PORTCLASS?= master @@ -52,9 +51,10 @@ RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} .endif CONFIGURE_ENV= EMACS=${EMACS_CMD} MAKE_FLAGS= EMACS=${EMACS_CMD} -SCRIPTS_ENV= INFILES=${INFILES} \ +SCRIPTS_ENV= TARGETS="${PSGML_SETUPEL}" \ EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} -PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} +PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ + PSGML_SETUPEL=${PSGML_SETUPEL} .else .BEGIN: @${ECHO} "Error: Bad port." diff --git a/editors/psgml/pkg-descr b/editors/psgml/pkg-descr index 12d6fa3be978..58efc7bcf6b3 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 'psml-setup) + (require 'psml-setupel) --- Porting by shige . diff --git a/editors/psgml/pkg-plist b/editors/psgml/pkg-plist index 74a376a96c5f..d7b1b23628d6 100644 --- a/editors/psgml/pkg-plist +++ b/editors/psgml/pkg-plist @@ -15,7 +15,7 @@ %%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-setup.el +%%EMACS_LIBDIR%%/site-lisp/%%PSGML_SETUPEL%% @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/scripts/configure b/editors/psgml/scripts/configure index 2feca2181bea..ecb50ff2751f 100644 --- a/editors/psgml/scripts/configure +++ b/editors/psgml/scripts/configure @@ -1,7 +1,5 @@ #!/bin/sh -TARGETS=${INFILES} - for i in ${TARGETS} do if [ -f ${WRKDIR}/${i}.in ]; then