svn commit: r373035 - in head: . editors editors/psgml editors/psgml/files

[Hiroki Sato]

Author: hrs
Date: Sat Nov 22 07:40:16 2014
New Revision: 373035
URL: https://svnweb.freebsd.org/changeset/ports/373035
QAT: https://qat.redports.org/buildarchive/r373035/

Log:
  Resurrect editors/psgml.

Added:
  head/editors/psgml/
     - copied from r366800, head/editors/psgml/
  head/editors/psgml/files/patch-Makefile.in
     - copied, changed from r366800, head/editors/psgml/files/patch-ad
Deleted:
  head/editors/psgml/files/patch-ad
Modified:
  head/MOVED
  head/editors/Makefile
  head/editors/psgml/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Nov 22 07:39:17 2014	(r373034)
+++ head/MOVED	Sat Nov 22 07:40:16 2014	(r373035)
@@ -6596,7 +6596,6 @@ editors/color-mate||2014-09-01|Not stage
 editors/gnuserv||2014-09-01|Not staged
 editors/jext||2014-09-01|Not staged
 editors/komodo-ide||2014-09-01|Not staged
-editors/psgml||2014-09-01|Not staged
 editors/setedit||2014-09-01|Not staged
 editors/softmaker-office||2014-09-01|Not staged
 editors/textedit||2014-09-01|Not staged

Modified: head/editors/Makefile
==============================================================================
--- head/editors/Makefile	Sat Nov 22 07:39:17 2014	(r373034)
+++ head/editors/Makefile	Sat Nov 22 07:40:16 2014	(r373035)
@@ -218,6 +218,7 @@
     SUBDIR += pico-alpine
     SUBDIR += pluma
     SUBDIR += poedit
+    SUBDIR += psgml
     SUBDIR += puff
     SUBDIR += py-room
     SUBDIR += rox-edit

Modified: head/editors/psgml/Makefile
==============================================================================
--- head/editors/psgml/Makefile	Sun Aug 31 17:37:10 2014	(r366800)
+++ head/editors/psgml/Makefile	Sat Nov 22 07:40:16 2014	(r373035)
@@ -3,7 +3,7 @@
 
 PORTNAME=	psgml
 PORTVERSION=	1.3.2
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -12,26 +12,24 @@ PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	hrs
 PATCHFILES=	psgml-symbol-conflict-050503.diff.gz
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	hrs at FreeBSD.org
 COMMENT=	Major mode for editing SGML and XML documents for Emacs
 
-SUB_FILES=	${PSGML_STARTUPEL}
-SUB_LIST=	PSGML_LISPDIR=${PSGML_LISPDIR}
-PLIST_SUB=	PSGML_STARTUPEL=${PSGML_STARTUPEL}
+POST_PATCHES=	${PATCHDIR}/post-patch-psgml.el
+USE_EMACS=	yes
 NOT_FOR_ARCHS=	ia64
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--lispdir=${PSGML_LISPDIR}
 CONFIGURE_ENV=	EMACS=${EMACS_CMD}
-USE_EMACS=	yes
-
-POSTPATCHES=	${FILESDIR}/post-patch-*
+SUB_FILES=	${PSGML_STARTUPEL}
+SUB_LIST=	PSGML_LISPDIR=${PSGML_LISPDIR}
+PLIST_SUB=	PSGML_STARTUPEL=${PSGML_STARTUPEL}
 
 INFO=		psgml psgml-api
 
 PSGML_STARTUPEL=	psgml-startup.el
 PSGML_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/psgml
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${EMACS_PORT_NAME} == xemacs21-mule
@@ -43,11 +41,11 @@ PLIST_SUB+=	XEMACS="@comment " \
 .endif
 
 post-patch:
-	cd ${PATCH_WRKSRC} && ${CAT} ${POSTPATCHES} | ${PATCH}
+	cd ${WRKSRC} && ${CAT} < ${POST_PATCHES}
 
 post-install:
-	cd ${WRKSRC} && ${MAKE} install-info
+	cd ${WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" ${MAKE} install-info
 	${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
-			${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
 .include <bsd.port.post.mk>

Copied and modified: head/editors/psgml/files/patch-Makefile.in (from r366800, head/editors/psgml/files/patch-ad)
==============================================================================
--- head/editors/psgml/files/patch-ad	Sun Aug 31 17:37:10 2014	(r366800, copy source)
+++ head/editors/psgml/files/patch-Makefile.in	Sat Nov 22 07:40:16 2014	(r373035)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sun Mar  6 01:23:40 2005
-+++ Makefile.in	Sat May 21 18:45:15 2005
-@@ -20,17 +20,29 @@
+--- Makefile.in.orig	2005-03-06 01:23:40.000000000 +0900
++++ Makefile.in	2014-11-22 15:59:39.000000000 +0900
+@@ -20,27 +20,39 @@
  SHELL = /bin/sh
  
  compile:
@@ -24,23 +24,30 @@
 +	${MAKE} info
  
 -install: compile 
+-	$(SHELL) mkinstalldirs $(lispdir)
 +install:
- 	$(SHELL) mkinstalldirs $(lispdir)
++	$(SHELL) mkinstalldirs $(DESTDIR)$(lispdir)
  	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/'` ; \
+-	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
+-	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
++	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p"; \
++	  $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p; \
++	  $(INSTALL_DATA) `echo $$p | sed 's/elc$$/el/'` $(DESTDIR)$(lispdir)/`echo $$p | sed 's/elc$$/el/'` ; \
  	done
- 	$(INSTALL_DATA) iso88591.map $(lispdir)
+-	$(INSTALL_DATA) iso88591.map $(lispdir)
++	$(INSTALL_DATA) iso88591.map $(DESTDIR)$(lispdir)
  
-@@ -39,8 +51,8 @@
- 	$(INSTALL_DATA) psgml-api.info $(infodir)
+ install-info:
+-	$(INSTALL_DATA) psgml.info $(infodir)
+-	$(INSTALL_DATA) psgml-api.info $(infodir)
++	$(INSTALL_DATA) psgml.info $(DESTDIR)$(infodir)
++	$(INSTALL_DATA) psgml-api.info $(DESTDIR)$(infodir)
  	if $(SHELL) -c 'install-info --version' \
  		>/dev/null 2>&1; then \
 -		install-info --info-dir=$(infodir) psgml.info; \
 -		install-info --info-dir=$(infodir) psgml-api.info; \
-+		install-info $(infodir)/psgml.info $(infodir)/dir; \
-+		install-info $(infodir)/psgml-api.info $(infodir)/dir; \
++		install-info $(DESTDIR)$(infodir)/psgml.info $(DESTDIR)$(infodir)/dir; \
++		install-info $(DESTDIR)$(infodir)/psgml-api.info $(DESTDIR)$(infodir)/dir; \
  	else true; fi