1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

- Fix the build with recent GCC [1]

- Conveniently redefine PORTEXAMPLES
- Clean up Makefile
- Improve upon port description
- Respect NOPORTEXAMPLES
- Drop now useless USE_GCC and USE_X_PREFIX

Reported by:	pointyhat (logs) [1]
This commit is contained in:
Alexey Dokuchaev 2007-07-02 19:10:41 +00:00
parent 9a0d0575be
commit b0b0e402f2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=194711
4 changed files with 16 additions and 13 deletions

View File

@ -1,4 +1,4 @@
# New ports collection makefile for: xenon
# New ports collection makefile for: Xenon
# Date created: 22 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
@ -16,10 +16,10 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Simple X-based text editor
USE_GMAKE= yes
USE_GCC= 3.4+
USE_X_PREFIX= yes
USE_XPM= yes
MAKEFILE= ${WRKSRC}/makefiles/Makefile.Linux
NOPRECIOUSSOFTMAKEVARS= yes
EXAMPLESDIR= ${PREFIX}/share/examples/ex
MAN1= xe.1
@ -27,8 +27,6 @@ FIX_FILES= Xe.h XeApp.C XeApp.h XeFontTable.C XeKeyTable.C \
XeKeyTable.h XeObject.C XeObject.h XeObjectTable.h XeText.C \
XeText.h
.include <bsd.port.pre.mk>
do-configure:
.for file in ${FIX_FILES}
@${REINPLACE_CMD} -e 's|#include <ext/|#include <|' \
@ -38,13 +36,17 @@ do-configure:
-e 's|#include <hash_map>|#include <ext/hash_map>|' \
-e 's|std::hash_map|__gnu_cxx::hash_map|g' \
-e 's|std::hash|__gnu_cxx::hash|g' \
${WRKSRC}/${file}
${WRKSRC}/${file}
.endfor
@${REINPLACE_CMD} '/friend int compare/d' ${WRKSRC}/KrAtom.h
@${REINPLACE_CMD} 's|<Undo\*>|<class Undo*>|' ${WRKSRC}/XeText.h
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xe ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/xe.1 ${PREFIX}/man/man1
@${MKDIR} ${PREFIX}/share/examples/xe
${INSTALL_DATA} ${WRKSRC}/xerc ${PREFIX}/share/examples/xe/sample.xerc
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/xerc ${EXAMPLESDIR}/sample.xerc
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View File

@ -14,7 +14,7 @@
$(TARGET): $(TARGETLIB) $(AUXTARGET).o
- $(CC) $(ARCH) $(LDFLAGS) $(AUXTARGET).o $(_LDFLAGS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(AUXTARGET).o $(_LDFLAGS) -o $(TARGET)
+ $(CXX) $(LDFLAGS) $(AUXTARGET).o $(_LDFLAGS) -o $(TARGET)
#$(SHTARGET): $(TARGETSO) $(TARGET).o
# $(CC) -o $(TARGET) -g $(TARGET).o $(SHLDFLAGS)

View File

@ -3,11 +3,12 @@ editing source code, system configuration files, scripts and whatever else
is an ASCII text file.
Features include:
* Speed, simplicity and low memory use.
* Search, substring or regular expression
* Unlimited undo/redo.
* Display of line numbers, jump to line number
* Some X resource configuration: mostly command keys, some colours
* Some X resource configuration: mostly command keys, some colors
* Man page!
* Some error dialogs.
* Multiple files in separate windows.

View File

@ -1,3 +1,3 @@
bin/xe
share/examples/xe/sample.xerc
@dirrm share/examples/xe
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.xerc
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%