aboutsummaryrefslogtreecommitdiff
path: root/editors/nedit
diff options
context:
space:
mode:
authorDaniel Eischen <deischen@FreeBSD.org>2002-08-23 20:03:18 +0000
committerDaniel Eischen <deischen@FreeBSD.org>2002-08-23 20:03:18 +0000
commit0505be0ca2d1d484687e2decdece96959a8cdc22 (patch)
tree8d953a3c3d91731d06e51401288af8433acf2b0d /editors/nedit
parentb174ad023e671d46c4ae0fb4d4f24a543a5d7144 (diff)
downloadports-0505be0ca2d1d484687e2decdece96959a8cdc22.tar.gz
ports-0505be0ca2d1d484687e2decdece96959a8cdc22.zip
Go back to kan's fix and set BINOWN, BINGRP, BINMODE in MAKE_ENV.
Trying to use INSTALL_{PROGRAM,DATA,MAN} just doesn't seem to work for nested makes. I give up trying to make it work.
Notes
Notes: svn path=/head/; revision=64904
Diffstat (limited to 'editors/nedit')
-rw-r--r--editors/nedit/Makefile1
-rw-r--r--editors/nedit/files/patch-aa6
-rw-r--r--editors/nedit/files/patch-ab4
3 files changed, 6 insertions, 5 deletions
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 2e5cac8f7f42..a563650d4326 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -23,6 +23,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
MAN1= nclient.1 nedit.1
ALL_TARGET= freebsd
+MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
post-extract:
${CP} ${DISTDIR}/nedit.app-defaults ${WRKSRC}/NEdit.ad
diff --git a/editors/nedit/files/patch-aa b/editors/nedit/files/patch-aa
index a82fba3bcf93..8b0d0863d571 100644
--- a/editors/nedit/files/patch-aa
+++ b/editors/nedit/files/patch-aa
@@ -8,9 +8,9 @@
+ install::
+ (cd source; make -f Makefile.freebsd install)
-+ ${INSTALL_MAN} doc/nedit.man ${PREFIX}/man/man1/nedit.1
-+ ${INSTALL_MAN} doc/nc.man ${PREFIX}/man/man1/nclient.1
-+ ${INSTALL_DATA} NEdit.ad ${X11BASE}/lib/X11/app-defaults/NEdit.ad
++ ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 doc/nedit.man ${PREFIX}/man/man1/nedit.1
++ ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 doc/nc.man ${PREFIX}/man/man1/nclient.1
++ ${INSTALL} ${COPY} -m 644 NEdit.ad ${X11BASE}/lib/X11/app-defaults/NEdit.ad
+
clean:
(cd util; $(MAKE) -f Makefile.common clean)
diff --git a/editors/nedit/files/patch-ab b/editors/nedit/files/patch-ab
index 9fef26b4d383..d106e7895b76 100644
--- a/editors/nedit/files/patch-ab
+++ b/editors/nedit/files/patch-ab
@@ -5,8 +5,8 @@
$(CC) $(CFLAGS) nc.o ../util/libNUtil.a $(LIBS) -o $@
+install: nedit nc
-+ ${INSTALL_PROGRAM} nedit ${PREFIX}/bin
-+ ${INSTALL_PROGRAM} nc ${PREFIX}/bin/nclient
++ ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nedit ${PREFIX}/bin
++ ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nc ${PREFIX}/bin/nclient
+
help.o: help.c
$(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@