head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.116 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.114 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.112 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.110 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.108 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.106 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.104 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.102 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.100 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.98 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.96 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.94 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.92 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.90 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.88 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.86 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.84 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.82 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.80 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.78 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.76 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.74 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.72 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.68 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.48 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.70 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.66 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.64 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.62 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.60 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.58 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.56 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.54 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.52 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.50 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.46 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.44 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.42 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.40 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.38 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.36 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.34 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.32 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.30 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.28 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.26 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.24 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.22 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.20 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.18 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.16 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.14 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.12 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.10 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.8 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.6 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.4 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.2 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.1.0.4 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.2; locks; strict; comment @# @; 1.2 date 2011.11.26.23.53.10; author sbd; state Exp; branches; next 1.1; 1.1 date 2011.08.18.05.03.10; author dholland; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2011.08.18.05.03.10; author tron; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2011.08.23.07.16.46; author tron; state Exp; branches; next ; desc @@ 1.2 log @1) Add missing devel/zlib buildlink. 2) Honor $(LDFLAGS). Bump PKGREVISION @ text @$NetBSD: patch-ae,v 1.1 2011/08/18 05:03:10 dholland Exp $ DESTDIR support. --- unix/unix.mak.orig 1999-03-06 22:43:28.000000000 +0000 +++ unix/unix.mak @@@@ -19,7 +19,7 @@@@ SHELL = /bin/sh BUILDERS = Makefile -install: _failmsg _all $(TF) LIBRARY $(MANPAGE) $(SYMLINK) +install: _failmsg _all $(DESTDIR)$(TF) LIBRARY $(DESTDIR)$(MANPAGE) $(DESTDIR)$(SYMLINK) @@echo '#####################################################' > exitmsg @@echo '## TinyFugue installation successful.' >> exitmsg @@echo "## You can safely delete everything in `cd ..; pwd`". >> exitmsg @@@@ -58,49 +58,49 @@@@ regexp.o: $(BUILDERS) config.h mv regexp/regexp.o . TF tf$(X): $(OBJS) $(BUILDERS) - $(CC) $(CFLAGS) -o tf$(X) $(OBJS) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o tf$(X) $(OBJS) $(LIBS) # @@# Some stupid linkers return ok status even if they fail. @@test -f tf$(X) # @@# ULTRIX's sh errors here if strip isn't found, despite "true". -test -z "$(STRIP)" || $(STRIP) tf$(X) || true -install_TF $(TF): tf$(X) $(BUILDERS) - -@@rm -f $(TF) - cp tf$(X) $(TF) - chmod $(MODE) $(TF) +install_TF $(DESTDIR)$(TF): tf$(X) $(BUILDERS) + -@@rm -f $(DESTDIR)$(TF) + cp tf$(X) $(DESTDIR)$(TF) + chmod $(MODE) $(DESTDIR)$(TF) -SYMLINK $(SYMLINK): $(TF) - test -z "$(SYMLINK)" || { rm -f $(SYMLINK) && ln -s $(TF) $(SYMLINK); } +SYMLINK $(DESTDIR)$(SYMLINK): $(DESTDIR)$(TF) + test -z "$(DESTDIR)$(SYMLINK)" || { rm -f $(DESTDIR)$(SYMLINK) && ln -s $(SYMLINKTARGET) $(DESTDIR)$(SYMLINK); } -LIBRARY $(LIBDIR): ../tf-lib/tf-help ../tf-lib/tf-help.idx +LIBRARY $(DESTDIR)$(LIBDIR): ../tf-lib/tf-help ../tf-lib/tf-help.idx @@echo '## Creating library directory...' # @@# Overly simplified shell commands, to avoid problems on ultrix - -@@test -n "$(LIBDIR)" || echo "LIBDIR is undefined. Check unix/Config." - test -n "$(LIBDIR)" - test -d "$(LIBDIR)" || mkdir $(LIBDIR) - -@@test -d "$(LIBDIR)" || echo "Can't make $(LIBDIR) directory. See if" - -@@test -d "$(LIBDIR)" || echo "there is already a file with that name." - test -d "$(LIBDIR)" + -@@test -n "$(DESTDIR)$(LIBDIR)" || echo "LIBDIR is undefined. Check unix/Config." + test -n "$(DESTDIR)$(LIBDIR)" + test -d "$(DESTDIR)$(LIBDIR)" || mkdir $(DESTDIR)$(LIBDIR) + -@@test -d "$(DESTDIR)$(LIBDIR)" || echo "Can't make $(DESTDIR)$(LIBDIR) directory. See if" + -@@test -d "$(DESTDIR)$(LIBDIR)" || echo "there is already a file with that name." + test -d "$(DESTDIR)$(LIBDIR)" # -# @@#rm -f $(LIBDIR)/*; # wrong: this would remove local.tf, etc. +# @@#rm -f $(DESTDIR)$(LIBDIR)/*; # wrong: this would remove local.tf, etc. @@echo '## Copying library files...' cd ../tf-lib; \ for f in *; do test -f $$f && files="$$files $$f"; done; \ - ( cd $(LIBDIR); rm -f $$files tf.help tf.help.index; ); \ - cp $$files $(LIBDIR); \ - cd $(LIBDIR); \ + ( cd $(DESTDIR)$(LIBDIR); rm -f $$files tf.help tf.help.index; ); \ + cp $$files $(DESTDIR)$(LIBDIR); \ + cd $(DESTDIR)$(LIBDIR); \ chmod $(MODE) $$files; chmod ugo-wx $$files - -rm -f $(LIBDIR)/CHANGES - cp ../CHANGES $(LIBDIR) - chmod $(MODE) $(LIBDIR)/CHANGES; chmod ugo-wx $(LIBDIR)/CHANGES - chmod $(MODE) $(LIBDIR) - -@@cd $(LIBDIR); old=`ls replace.tf 2>/dev/null`; \ + -rm -f $(DESTDIR)$(LIBDIR)/CHANGES + cp ../CHANGES $(DESTDIR)$(LIBDIR) + chmod $(MODE) $(DESTDIR)$(LIBDIR)/CHANGES; chmod ugo-wx $(DESTDIR)$(LIBDIR)/CHANGES + chmod $(MODE) $(DESTDIR)$(LIBDIR) + -@@cd $(DESTDIR)$(LIBDIR); old=`ls replace.tf 2>/dev/null`; \ if [ -n "$$old" ]; then \ - echo "## WARNING: Obsolete files found in $(LIBDIR): $$old"; \ + echo "## WARNING: Obsolete files found in $(DESTDIR)$(LIBDIR): $$old"; \ fi @@echo '## Creating links so old library names still work...' # @@# note: ln -sf isn't portable. - @@cd $(LIBDIR); \ + @@cd $(DESTDIR)$(LIBDIR); \ rm -f bind-bash.tf; ln -s kb-bash.tf bind-bash.tf; \ rm -f bind-emacs.tf; ln -s kb-emacs.tf bind-emacs.tf; \ rm -f completion.tf; ln -s complete.tf completion.tf; \ @@@@ -126,10 +126,10 @@@@ __always__: $(MAKE) -f ../unix/unix.mak CC='$(CC)' CFLAGS='$(FLAGS)' makehelp ./makehelp < ../tf-lib/tf-help > ../tf-lib/tf-help.idx -MANPAGE $(MANPAGE): $(BUILDERS) tf.1.$(MANTYPE)man - cp tf.1.$(MANTYPE)man $(MANPAGE) - chmod $(MODE) $(MANPAGE) - chmod ugo-x $(MANPAGE) +MANPAGE $(DESTDIR)$(MANPAGE): $(BUILDERS) tf.1.$(MANTYPE)man + cp tf.1.$(MANTYPE)man $(DESTDIR)$(MANPAGE) + chmod $(MODE) $(DESTDIR)$(MANPAGE) + chmod ugo-x $(DESTDIR)$(MANPAGE) tf.1.catman: tf.1.nroffman TERM=vt100; nroff -man tf.1.nroffman > tf.1.catman @@@@ -142,6 +142,7 @@@@ Makefile: ../unix/Config ../unix/vars.ma dist: tf.1.catman ../tf-lib/tf-help.idx uninstall: + false @@echo "Remove $(LIBDIR) $(TF) $(MANPAGE)" @@echo "Is this okay? (y/n)" @@read response; test "$$response" = "y" @ 1.1 log @Fix broken destdirization. (hi joerg) For some reason the "Checking for work-directory references" test didn't catch the fact that ${DESTDIR}${LIBDIR} was being compiled into the main binary as its library search path. Noted by moof. PKGREVISION -> 7 @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- unix/unix.mak~ 1999-03-06 22:43:28.000000000 +0000 d16 8 a23 1 @@@@ -64,43 +64,43 @@@@ TF tf$(X): $(OBJS) $(BUILDERS) @ 1.1.2.1 log @file patch-ae was added on branch pkgsrc-2011Q2 on 2011-08-23 07:16:46 +0000 @ text @d1 106 @ 1.1.2.2 log @Pullup ticket #3503 - requested by dholland net/tinyfugue: bug fix Revisions pulled up: - net/tinyfugue/Makefile 1.28 - net/tinyfugue/distinfo 1.13 - net/tinyfugue/patches/patch-ab 1.9 - net/tinyfugue/patches/patch-ac 1.5 - net/tinyfugue/patches/patch-ae 1.1 --- Module Name: pkgsrc Committed By: dholland Date: Thu Aug 18 05:03:10 UTC 2011 Modified Files: pkgsrc/net/tinyfugue: Makefile distinfo pkgsrc/net/tinyfugue/patches: patch-ab patch-ac Added Files: pkgsrc/net/tinyfugue/patches: patch-ae Log Message: Fix broken destdirization. (hi joerg) For some reason the "Checking for work-directory references" test didn't catch the fact that ${DESTDIR}${LIBDIR} was being compiled into the main binary as its library search path. Noted by moof. PKGREVISION -> 7 @ text @a0 106 $NetBSD$ DESTDIR support. --- unix/unix.mak~ 1999-03-06 22:43:28.000000000 +0000 +++ unix/unix.mak @@@@ -19,7 +19,7 @@@@ SHELL = /bin/sh BUILDERS = Makefile -install: _failmsg _all $(TF) LIBRARY $(MANPAGE) $(SYMLINK) +install: _failmsg _all $(DESTDIR)$(TF) LIBRARY $(DESTDIR)$(MANPAGE) $(DESTDIR)$(SYMLINK) @@echo '#####################################################' > exitmsg @@echo '## TinyFugue installation successful.' >> exitmsg @@echo "## You can safely delete everything in `cd ..; pwd`". >> exitmsg @@@@ -64,43 +64,43 @@@@ TF tf$(X): $(OBJS) $(BUILDERS) # @@# ULTRIX's sh errors here if strip isn't found, despite "true". -test -z "$(STRIP)" || $(STRIP) tf$(X) || true -install_TF $(TF): tf$(X) $(BUILDERS) - -@@rm -f $(TF) - cp tf$(X) $(TF) - chmod $(MODE) $(TF) +install_TF $(DESTDIR)$(TF): tf$(X) $(BUILDERS) + -@@rm -f $(DESTDIR)$(TF) + cp tf$(X) $(DESTDIR)$(TF) + chmod $(MODE) $(DESTDIR)$(TF) -SYMLINK $(SYMLINK): $(TF) - test -z "$(SYMLINK)" || { rm -f $(SYMLINK) && ln -s $(TF) $(SYMLINK); } +SYMLINK $(DESTDIR)$(SYMLINK): $(DESTDIR)$(TF) + test -z "$(DESTDIR)$(SYMLINK)" || { rm -f $(DESTDIR)$(SYMLINK) && ln -s $(SYMLINKTARGET) $(DESTDIR)$(SYMLINK); } -LIBRARY $(LIBDIR): ../tf-lib/tf-help ../tf-lib/tf-help.idx +LIBRARY $(DESTDIR)$(LIBDIR): ../tf-lib/tf-help ../tf-lib/tf-help.idx @@echo '## Creating library directory...' # @@# Overly simplified shell commands, to avoid problems on ultrix - -@@test -n "$(LIBDIR)" || echo "LIBDIR is undefined. Check unix/Config." - test -n "$(LIBDIR)" - test -d "$(LIBDIR)" || mkdir $(LIBDIR) - -@@test -d "$(LIBDIR)" || echo "Can't make $(LIBDIR) directory. See if" - -@@test -d "$(LIBDIR)" || echo "there is already a file with that name." - test -d "$(LIBDIR)" + -@@test -n "$(DESTDIR)$(LIBDIR)" || echo "LIBDIR is undefined. Check unix/Config." + test -n "$(DESTDIR)$(LIBDIR)" + test -d "$(DESTDIR)$(LIBDIR)" || mkdir $(DESTDIR)$(LIBDIR) + -@@test -d "$(DESTDIR)$(LIBDIR)" || echo "Can't make $(DESTDIR)$(LIBDIR) directory. See if" + -@@test -d "$(DESTDIR)$(LIBDIR)" || echo "there is already a file with that name." + test -d "$(DESTDIR)$(LIBDIR)" # -# @@#rm -f $(LIBDIR)/*; # wrong: this would remove local.tf, etc. +# @@#rm -f $(DESTDIR)$(LIBDIR)/*; # wrong: this would remove local.tf, etc. @@echo '## Copying library files...' cd ../tf-lib; \ for f in *; do test -f $$f && files="$$files $$f"; done; \ - ( cd $(LIBDIR); rm -f $$files tf.help tf.help.index; ); \ - cp $$files $(LIBDIR); \ - cd $(LIBDIR); \ + ( cd $(DESTDIR)$(LIBDIR); rm -f $$files tf.help tf.help.index; ); \ + cp $$files $(DESTDIR)$(LIBDIR); \ + cd $(DESTDIR)$(LIBDIR); \ chmod $(MODE) $$files; chmod ugo-wx $$files - -rm -f $(LIBDIR)/CHANGES - cp ../CHANGES $(LIBDIR) - chmod $(MODE) $(LIBDIR)/CHANGES; chmod ugo-wx $(LIBDIR)/CHANGES - chmod $(MODE) $(LIBDIR) - -@@cd $(LIBDIR); old=`ls replace.tf 2>/dev/null`; \ + -rm -f $(DESTDIR)$(LIBDIR)/CHANGES + cp ../CHANGES $(DESTDIR)$(LIBDIR) + chmod $(MODE) $(DESTDIR)$(LIBDIR)/CHANGES; chmod ugo-wx $(DESTDIR)$(LIBDIR)/CHANGES + chmod $(MODE) $(DESTDIR)$(LIBDIR) + -@@cd $(DESTDIR)$(LIBDIR); old=`ls replace.tf 2>/dev/null`; \ if [ -n "$$old" ]; then \ - echo "## WARNING: Obsolete files found in $(LIBDIR): $$old"; \ + echo "## WARNING: Obsolete files found in $(DESTDIR)$(LIBDIR): $$old"; \ fi @@echo '## Creating links so old library names still work...' # @@# note: ln -sf isn't portable. - @@cd $(LIBDIR); \ + @@cd $(DESTDIR)$(LIBDIR); \ rm -f bind-bash.tf; ln -s kb-bash.tf bind-bash.tf; \ rm -f bind-emacs.tf; ln -s kb-emacs.tf bind-emacs.tf; \ rm -f completion.tf; ln -s complete.tf completion.tf; \ @@@@ -126,10 +126,10 @@@@ __always__: $(MAKE) -f ../unix/unix.mak CC='$(CC)' CFLAGS='$(FLAGS)' makehelp ./makehelp < ../tf-lib/tf-help > ../tf-lib/tf-help.idx -MANPAGE $(MANPAGE): $(BUILDERS) tf.1.$(MANTYPE)man - cp tf.1.$(MANTYPE)man $(MANPAGE) - chmod $(MODE) $(MANPAGE) - chmod ugo-x $(MANPAGE) +MANPAGE $(DESTDIR)$(MANPAGE): $(BUILDERS) tf.1.$(MANTYPE)man + cp tf.1.$(MANTYPE)man $(DESTDIR)$(MANPAGE) + chmod $(MODE) $(DESTDIR)$(MANPAGE) + chmod ugo-x $(DESTDIR)$(MANPAGE) tf.1.catman: tf.1.nroffman TERM=vt100; nroff -man tf.1.nroffman > tf.1.catman @@@@ -142,6 +142,7 @@@@ Makefile: ../unix/Config ../unix/vars.ma dist: tf.1.catman ../tf-lib/tf-help.idx uninstall: + false @@echo "Remove $(LIBDIR) $(TF) $(MANPAGE)" @@echo "Is this okay? (y/n)" @@read response; test "$$response" = "y" @