aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--editors/ne/Makefile41
-rw-r--r--editors/ne/distinfo6
2 files changed, 32 insertions, 15 deletions
diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index bb477ddf6686..8c06f9da404d 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= ne
-PORTVERSION= 2.0.3
+PORTVERSION= 2.1
CATEGORIES= editors
MASTER_SITES= http://ne.dsi.unimi.it/
MAINTAINER= ports@FreeBSD.org
COMMENT= Nice and powerfull editor
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
+BUILD_WRKSRC= ${WRKSRC}/src
USE_PERL5_BUILD=yes
USE_GMAKE= yes
@@ -21,12 +21,16 @@ MAKEFILE= makefile
ALL_TARGET= ${PORTNAME}
MAKE_ARGS= CC="${CC}" \
CFLAGS="${CFLAGS}" \
+ LDFLAGS="-lgnuregex" \
NE_GLOBAL_DIR="${DATADIR}"
-MAKE_JOBS_UNSAFE= yes
+MAKE_JOBS_SAFE= yes
-MAN1= ne.1
-PORTDOCS= ne.txt
-PLIST_FILES= bin/ne %%DATADIR%%/default.keys %%DATADIR%%/default.menus
+MAN1= ${PORTNAME}.1
+INFO= ${PORTNAME}
+PORTDOCS= ${PORTNAME}.txt
+PLIST_FILES= bin/${PORTNAME} \
+ %%DATADIR%%/default.keys \
+ %%DATADIR%%/default.menus
PLIST_DIRS= %%DATADIR%%
.if !defined(WITH_DEBUG)
@@ -34,17 +38,30 @@ CFLAGS+= -DNODEBUG
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|tmpnam(|mkstemp(|g' ${WRKSRC}/actions.c
+.for file in actions.c
+ @${REINPLACE_CMD} -e 's|tmpnam(|mkstemp(|g' ${BUILD_WRKSRC}/${file}
+.endfor
+.for file in ne.c search.c
+ @${REINPLACE_CMD} -e 's|"regex\.h"|<gnu/regex.h>|g' ${BUILD_WRKSRC}/${file}
+.endfor
+.for file in makefile
+ @${REINPLACE_CMD} -e '/[[:space:]]regex.o/d ; \
+ s|regex.h||g' ${BUILD_WRKSRC}/${file}
+.endfor
+
+post-build:
+ cd ${WRKSRC}/doc && makeinfo ${PORTNAME}.texinfo
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/ne ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/../doc/ne.1 ${MANPREFIX}/man/man1
+ ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${MANPREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info ${PREFIX}/${INFO_PATH}
@${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/../doc/default.keys ${DATADIR}/
- ${INSTALL_DATA} ${WRKSRC}/../doc/default.menus ${DATADIR}/
+ ${INSTALL_DATA} ${WRKSRC}/doc/default.keys ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/default.menus ${DATADIR}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/../doc/ne.txt ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.txt ${DOCSDIR}
.endif
.include <bsd.port.mk>
diff --git a/editors/ne/distinfo b/editors/ne/distinfo
index 5759de57e766..ef5f24b7355a 100644
--- a/editors/ne/distinfo
+++ b/editors/ne/distinfo
@@ -1,3 +1,3 @@
-MD5 (ne-2.0.3.tar.gz) = 16ed5c974adb8255a693f8a3b6e91071
-SHA256 (ne-2.0.3.tar.gz) = 7ba91b956f9308128236b9e3ded4307e061ad0558f9270eae9845c82951ab34e
-SIZE (ne-2.0.3.tar.gz) = 1102424
+MD5 (ne-2.1.tar.gz) = 9f76652f6349721cfe0e8dc2aec9c767
+SHA256 (ne-2.1.tar.gz) = e47d00322edd09e3ffc44daf16b322fe56c6430d1bf53f06f7b28f9a5440fed1
+SIZE (ne-2.1.tar.gz) = 1016020