diff options
Diffstat (limited to 'textproc/xmlcatmgr')
-rw-r--r-- | textproc/xmlcatmgr/Makefile | 37 | ||||
-rw-r--r-- | textproc/xmlcatmgr/distinfo | 4 | ||||
-rw-r--r-- | textproc/xmlcatmgr/files/pkg-deinstall.in | 4 | ||||
-rw-r--r-- | textproc/xmlcatmgr/pkg-plist | 6 |
4 files changed, 14 insertions, 37 deletions
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile index 5501aeff2b0b..3bf1b833f943 100644 --- a/textproc/xmlcatmgr/Makefile +++ b/textproc/xmlcatmgr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xmlcatmgr -PORTVERSION= 2.1 +PORTVERSION= 2.2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,25 +16,11 @@ COMMENT= SGML and XML catalog manager MAN1= xmlcatmgr.1 -HAS_CONFIGURE= yes - -CONFIGURE_SCRIPT= configure.sh -CONFIGURE_ARGS= -D \ - -p ${PREFIX} \ - -d ${DOCSDIR} \ - -c ${CATALOG_PORTS_XML} \ - -C ${CATALOG_PORTS_SGML} -.if defined(NOPORTDOCS) -CONFIGURE_ARGS+= -n doc -.endif -CONFIGURE_ENV= SED="${SED}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_DIR="${INSTALL_DATA_DIR}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - NOPORTDOCS="${NOPORTDOCS}" - -BUILD_WRKSRC= ${WRKSRC}/work -INSTALL_WRKSRC= ${WRKSRC}/work +GNU_CONFIGURE= yes +CONFIGURE_ARGS= DEFAULT_CATALOG_SGML=${CATALOG_PORTS_SGML} \ + DEFAULT_CATALOG_XML=${CATALOG_PORTS_XML} +PKGINSTALL= ${WRKDIR}/pkg-install.sh +PKGDEINSTALL= ${WRKDIR}/pkg-deinstall.sh COMMONVARS= ${WRKDIR}/commonvars.sh XMLCATMGR?= ${PREFIX}/bin/xmlcatmgr @@ -43,14 +29,11 @@ CATALOG_PORTS_SGML?= ${PREFIX}/share/sgml/catalog.ports CATALOG_MASTER_XML?= ${PREFIX}/share/xml/catalog CATALOG_PORTS_XML?= ${PREFIX}/share/xml/catalog.ports -PKGINSTALL= ${WRKDIR}/pkg-install.sh -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall.sh - post-build: - ${TOUCH} ${COMMONVARS} - ${ECHO} '#!/bin/sh' >> ${COMMONVARS} - ${ECHO} 'PATH=$${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin' >> ${COMMONVARS} - ${ECHO} 'export PATH;' >> ${COMMONVARS} + ( ${ECHO} '#!/bin/sh'; \ + ${ECHO} 'PATH=$${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin'; \ + ${ECHO} 'export PATH;'; \ + ) > ${COMMONVARS} .for V in XMLCATMGR CATALOG_MASTER_SGML CATALOG_MASTER_XML CATALOG_PORTS_SGML CATALOG_PORTS_XML ${ECHO} '${V}=${${V}}' >> ${COMMONVARS} .endfor diff --git a/textproc/xmlcatmgr/distinfo b/textproc/xmlcatmgr/distinfo index 87e94cfc4043..19f4d61e1816 100644 --- a/textproc/xmlcatmgr/distinfo +++ b/textproc/xmlcatmgr/distinfo @@ -1,2 +1,2 @@ -MD5 (xmlcatmgr-2.1.tar.gz) = 12d83deb750d9ef3b199b5bb9fdaac72 -SIZE (xmlcatmgr-2.1.tar.gz) = 28716 +MD5 (xmlcatmgr-2.2.tar.gz) = 4b0c7e075f5ff5aa86537b403468739a +SIZE (xmlcatmgr-2.2.tar.gz) = 97265 diff --git a/textproc/xmlcatmgr/files/pkg-deinstall.in b/textproc/xmlcatmgr/files/pkg-deinstall.in index 302edca4d79f..76e1526368df 100644 --- a/textproc/xmlcatmgr/files/pkg-deinstall.in +++ b/textproc/xmlcatmgr/files/pkg-deinstall.in @@ -5,7 +5,7 @@ DEINSTALL) T=/tmp/catalog.$$ -${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} remove catalog.ports +${XMLCATMGR} -sc ${CATALOG_MASTER_SGML} remove CATALOG catalog.ports ${XMLCATMGR} -sc ${T} create if cmp -s ${T} ${CATALOG_MASTER_SGML} ]; then echo " + Removing ${CATALOG_MASTER_SGML}. It is empty." @@ -17,7 +17,7 @@ if cmp -s ${T} ${CATALOG_PORTS_SGML} ]; then fi rm -f ${T} -${XMLCATMGR} -c ${CATALOG_MASTER_XML} remove ${CATALOG_PORTS_XML} +${XMLCATMGR} -c ${CATALOG_MASTER_XML} remove nextCatalog ${CATALOG_PORTS_XML} ${XMLCATMGR} -c ${T} create if cmp -s ${T} ${CATALOG_MASTER_XML} ]; then echo " + Removing ${CATALOG_MASTER_XML}. It is empty." diff --git a/textproc/xmlcatmgr/pkg-plist b/textproc/xmlcatmgr/pkg-plist index fd9940f7950b..104a4c67707c 100644 --- a/textproc/xmlcatmgr/pkg-plist +++ b/textproc/xmlcatmgr/pkg-plist @@ -1,8 +1,2 @@ @comment $FreeBSD$ bin/xmlcatmgr -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/PEOPLE -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%@dirrm %%DOCSDIR%% |