diff options
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/manedit/Makefile | 30 | ||||
| -rw-r--r-- | editors/manedit/files/md5 | 4 | ||||
| -rw-r--r-- | editors/manedit/files/patch-sum | 5 | ||||
| -rw-r--r-- | editors/manedit/patches/patch-ab | 17 | ||||
| -rw-r--r-- | editors/manedit/patches/patch-af | 18 |
5 files changed, 48 insertions, 26 deletions
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile index 2cbb8804719..fd43e1a4a86 100644 --- a/editors/manedit/Makefile +++ b/editors/manedit/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/01/21 18:18:04 fredb Exp $ +# $NetBSD: Makefile,v 1.2 2001/02/10 00:07:40 hubertf Exp $ # DISTNAME= ${PKGNAME:S,manedit-,manedit,} -PKGNAME= manedit-0.4e +PKGNAME= manedit-0.4h CATEGORIES= editors MASTER_SITES= ftp://fox.mit.edu/pub/xsw/ EXTRACT_SUFX= .tgz @@ -14,28 +14,32 @@ DEPENDS+= gtk+-*:../../x11/gtk WRKSRC= ${WRKDIR}/${DISTNAME}/manedit +MAKE_ENV+= "CC=${CC}" \ + "CFLAGS=${CFLAGS}" \ + "CPP=${CXX}" \ + "PREFIX=${PREFIX}" + post-patch: - ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@CC@,${CC},g" \ - -e "s,@CFLAGS@,${CFLAGS},g" < ${WRKSRC}/Makefile \ - > ${WRKSRC}/Makefile.done - ${MV} ${WRKSRC}/Makefile.done ${WRKSRC}/Makefile - ${SED} -e "s,@PREFIX@,${PREFIX},g" < ${WRKSRC}/manedit.1 \ + ${SED} -e "s,@PREFIX@,${PREFIX},g" ${WRKSRC}/manedit.1 \ > ${WRKSRC}/manedit.1.done ${MV} ${WRKSRC}/manedit.1.done ${WRKSRC}/manedit.1 + ${SED} -e "s,gtk-config,${X11BASE}/bin/gtk-config,g" \ + ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.done + ${MV} ${WRKSRC}/Makefile.done ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/manedit ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/manedit \ - ${PREFIX}/share/manedit/templates \ + ${INSTALL_DATA_DIR} ${PREFIX}/share/manedit \ + ${PREFIX}/share/manedit/templates \ ${PREFIX}/share/manedit/icons ${INSTALL_MAN} ${WRKSRC}/manedit.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/help/manpage_writing_procedures \ + ${INSTALL_MAN} ${WRKSRC}/help/manpage_writing_procedures \ ${PREFIX}/man/man7/manpage_writing_procedures.7 - ${INSTALL_MAN} ${WRKSRC}/help/manpage_xml_referance \ + ${INSTALL_MAN} ${WRKSRC}/help/manpage_xml_referance \ ${PREFIX}/man/man7/manpage_xml_reference.7 - cd ${WRKSRC}/templates && ${INSTALL_DATA} api.mpt config.mpt \ + cd ${WRKSRC}/templates && ${INSTALL_DATA} api.mpt config.mpt \ intro.mpt program.mpt ${PREFIX}/share/manedit/templates - cd ${WRKSRC} && ${INSTALL_DATA} manedit.xpm \ + cd ${WRKSRC} && ${INSTALL_DATA} manedit.xpm \ ${PREFIX}/share/manedit/icons .include "../../mk/bsd.pkg.mk" diff --git a/editors/manedit/files/md5 b/editors/manedit/files/md5 index ec7713954f4..07cca9b5824 100644 --- a/editors/manedit/files/md5 +++ b/editors/manedit/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2001/01/21 18:18:04 fredb Exp $ +$NetBSD: md5,v 1.2 2001/02/10 00:07:41 hubertf Exp $ -MD5 (manedit0.4e.tgz) = 10cdb4c7c81e6ddb7d4677333b1328b9 +MD5 (manedit0.4h.tgz) = 7aa6bf57705f3a8b21fc5d45ff654a4f diff --git a/editors/manedit/files/patch-sum b/editors/manedit/files/patch-sum index be1e8b15e23..f1bb9b7ada7 100644 --- a/editors/manedit/files/patch-sum +++ b/editors/manedit/files/patch-sum @@ -1,7 +1,8 @@ -$NetBSD: patch-sum,v 1.1.1.1 2001/01/21 18:18:04 fredb Exp $ +$NetBSD: patch-sum,v 1.2 2001/02/10 00:07:41 hubertf Exp $ MD5 (patch-aa) = de297b8475290223408074b716c255f3 -MD5 (patch-ab) = badf577cb2a2679691235fc5d01e81a0 +MD5 (patch-ab) = 3c8dc62ddd7d2ea8c40bcd7022b2e722 MD5 (patch-ac) = a6a6bbc7e01f616cce0eadebc3071783 MD5 (patch-ad) = 42b90356b02e8c5cbffb71e858d3b5e2 MD5 (patch-ae) = 64260aa8eeeab084586f88aa18f7851c +MD5 (patch-af) = 9fe8a0be45b5cde867ee1900f36c82b2 diff --git a/editors/manedit/patches/patch-ab b/editors/manedit/patches/patch-ab index 0c0b38eb5ff..87b0e944b56 100644 --- a/editors/manedit/patches/patch-ab +++ b/editors/manedit/patches/patch-ab @@ -1,31 +1,30 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/01/21 18:18:04 fredb Exp $ +$NetBSD: patch-ab,v 1.2 2001/02/10 00:07:41 hubertf Exp $ ---- Makefile.orig Sat Jan 20 12:39:28 2001 +--- Makefile.orig Fri Feb 9 01:18:25 2001 +++ Makefile -@@ -18,7 +18,7 @@ +@@ -18,7 +18,6 @@ # You may modify any value as needed. Change only the ones you are # absolutly sure that requires modification. # -PREFIX = /usr -+PREFIX = @PREFIX@ # ######################################################################## -@@ -49,7 +49,7 @@ +@@ -49,7 +48,7 @@ # to debug the program. # #CFLAGS = `gtk-config --cflags` -g -efence -Wall -CFLAGS = `gtk-config --cflags` -O2 -Wall -+CFLAGS = `gtk-config --cflags` @CFLAGS@ ++CFLAGS+= `gtk-config --cflags` -Wall CPPFLAGS = -D__cplusplus -Dc_plusplus -@@ -95,7 +95,7 @@ +@@ -95,8 +94,6 @@ # include Makefile.srclist -CC = gcc -+CC = @CC@ - CPP = g++ +-CPP = g++ BIN = manedit OBJ_C = $(SRC_C:.c=.o) + OBJ_CPP = $(SRC_CPP:.cpp=.o) diff --git a/editors/manedit/patches/patch-af b/editors/manedit/patches/patch-af new file mode 100644 index 00000000000..ce06c1815f2 --- /dev/null +++ b/editors/manedit/patches/patch-af @@ -0,0 +1,18 @@ +$NetBSD: patch-af,v 1.1 2001/02/10 00:07:42 hubertf Exp $ + +--- ../include/os.h.orig Fri Feb 9 01:18:26 2001 ++++ ../include/os.h +@@ -58,11 +58,11 @@ + # define _PATH_DEVNULL "/dev/null" + #endif + +-#ifndef _AIX ++#if !defined(_AIX) && !defined(__NetBSD__) + # ifndef _PATH_MAILDIR + # define _PATH_MAILDIR "/var/spool/mail" + # endif +-#endif /* _AIX */ ++#endif /* _AIX || __NetBSD__ */ + + /* Apparently VI has become the standard editor for UNIX. */ + #if !defined(_PATH_VI) && !defined(__MSW__) |