diff options
| -rw-r--r-- | textproc/xmlppm/Makefile | 20 | ||||
| -rw-r--r-- | textproc/xmlppm/distinfo | 2 | ||||
| -rw-r--r-- | textproc/xmlppm/files/patch-Makefile | 12 | ||||
| -rw-r--r-- | textproc/xmlppm/pkg-plist | 2 |
4 files changed, 15 insertions, 21 deletions
diff --git a/textproc/xmlppm/Makefile b/textproc/xmlppm/Makefile index 28794790a52d..40ec7a743b52 100644 --- a/textproc/xmlppm/Makefile +++ b/textproc/xmlppm/Makefile @@ -7,8 +7,7 @@ # PORTNAME= xmlppm -PORTVERSION= 0.96 -PORTREVISION= 2 +PORTVERSION= 0.97 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.cs.cornell.edu/People/jcheney/xmlppm/ @@ -18,16 +17,21 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= XML-Conscious PPM Compression -LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \ + expat.4:${PORTSDIR}/textproc/expat2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USE_REINPLACE= yes -USE_GMAKE= yes -post-patch: - @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile +USE_GMAKE= yes +MAKE_ARGS= CC="${CXX}" OPT_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv" do-install: - @(cd ${WRKSRC} ; ${INSTALL_PROGRAM} xmlppm xmlunppm ${PREFIX}/bin) + ${INSTALL_PROGRAM} ${WRKSRC}/xmlppm ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/xmlunppm ${PREFIX}/bin +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR} +.endif .include <bsd.port.mk> diff --git a/textproc/xmlppm/distinfo b/textproc/xmlppm/distinfo index 56be72ac611e..8b20a0a1b278 100644 --- a/textproc/xmlppm/distinfo +++ b/textproc/xmlppm/distinfo @@ -1 +1 @@ -MD5 (xmlppm-0.96-src.tar.gz) = a68d60838f9dbe5543d466d208603d71 +MD5 (xmlppm-0.97-src.tar.gz) = 89a5aa7f2ff5a96e3894f3a97aec0f1d diff --git a/textproc/xmlppm/files/patch-Makefile b/textproc/xmlppm/files/patch-Makefile deleted file mode 100644 index 3a5dee160556..000000000000 --- a/textproc/xmlppm/files/patch-Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- Makefile.orig Sat May 12 03:21:58 2001 -+++ Makefile Tue May 15 11:59:08 2001 -@@ -1,7 +1,6 @@ --CC = gcc - #XPPMFLAGS = -DELTPREC_P=1 -DATTPREC=1 -DCHARPREC=1 -DELTORDER=5 -DATTORDER=5 -DCHARORDER=5 -DATTS -DCHAR -DSYMS --CFLAGS = $(XPPMFLAGS) -O2 -Wall -ansi --LFLAGS = -lexpat -lm -+CFLAGS += -I%%LOCALBASE%%/include -+LFLAGS = -L%%LOCALBASE%%/lib -lexpat -lm - #LFLAGS = /usr/lib/libexpat.a -lm - - BINARIES = xmlppm xmlunppm diff --git a/textproc/xmlppm/pkg-plist b/textproc/xmlppm/pkg-plist index dc589840cf56..4915a0056c7d 100644 --- a/textproc/xmlppm/pkg-plist +++ b/textproc/xmlppm/pkg-plist @@ -1,2 +1,4 @@ bin/xmlppm bin/xmlunppm +%%PORTDOCS%%share/doc/xmlppm/README +%%PORTDOCS%%@dirrm share/doc/xmlppm |