From c1adfb78e81ade48a23d26f96a9e61dce0e444e0 Mon Sep 17 00:00:00 2001 From: jmmv Date: Sun, 22 Dec 2002 12:22:05 +0000 Subject: Make this package install its configuration file under the examples hierarchy and use bsd.pkg.install.mk (PKG_SYSCONFDIR) to copy it to the right place. Bump PKGREVISION to 1. While editing patch-aa, switch it to unified diff format, as recommended by agc. --- audio/tracker/Makefile | 11 +++- audio/tracker/PLIST | 5 +- audio/tracker/distinfo | 4 +- audio/tracker/patches/patch-aa | 116 +++++++++++++++-------------------------- 4 files changed, 56 insertions(+), 80 deletions(-) (limited to 'audio/tracker') diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile index 703ff1117a9..17ed6a40cca 100644 --- a/audio/tracker/Makefile +++ b/audio/tracker/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2002/07/22 17:01:00 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2002/12/22 12:22:05 jmmv Exp $ # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp # DISTNAME= tracker-5.3 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= # empty EXTRACT_SUFX= .tgz @@ -20,7 +21,11 @@ WRKSRC= ${WRKDIR}/tracker MAKE_FLAGS= MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \ INST_BIN_OPT="-c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \ INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \ - COMPRESSION_FILE=${PREFIX}/etc/compression_methods + COMPRESSION_FILE=${PKG_SYSCONFDIR}/compression_methods \ + COMPRESSION_FILE_EG=${EGDIR}/compression_methods + +EGDIR= ${PREFIX}/share/examples/tracker +CONF_FILES= ${EGDIR}/compression_methods ${PKG_SYSCONFDIR}/compression_methods INFO_FILES= tracker.info @@ -29,10 +34,12 @@ pre-install: ${MAKEINFO} --no-split tracker.texinfo -o tracker.info && \ ${CP} tracker.info ${PREFIX}/info && \ ${RM} -f tracker.info *.orig + ${INSTALL_DATA_DIR} ${EGDIR} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tracker ${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker .include "../../mk/texinfo.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/tracker/PLIST b/audio/tracker/PLIST index 369596fa587..3e39ad002dc 100644 --- a/audio/tracker/PLIST +++ b/audio/tracker/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:02 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/12/22 12:22:05 jmmv Exp $ bin/tracker bin/randomize -etc/compression_methods @unexec ${INSTALL_INFO} --delete %D/info/tracker.info %D/info/dir info/tracker.info @exec ${INSTALL_INFO} %D/info/tracker.info %D/info/dir @@ -89,5 +88,7 @@ share/doc/tracker/splitmod.readme share/doc/tracker/readme share/doc/tracker/protracker.fmt share/doc/tracker/FAQ +share/examples/tracker/compression_methods +@dirrm share/examples/tracker @dirrm share/doc/tracker/Html @dirrm share/doc/tracker diff --git a/audio/tracker/distinfo b/audio/tracker/distinfo index 557044f62b8..36a30859426 100644 --- a/audio/tracker/distinfo +++ b/audio/tracker/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 12:14:39 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/12/22 12:22:05 jmmv Exp $ SHA1 (tracker-5.3.tgz) = b0973d6a9c363caebd3a71547412f42b0681f323 Size (tracker-5.3.tgz) = 454803 bytes -SHA1 (patch-aa) = fa95653b7e6128d3d6c10047fcc3fcd2db4f4a2b +SHA1 (patch-aa) = 0b0f951a3da8fc0d4eaf563c23ebf8876ba25203 SHA1 (patch-ab) = d12637496bb73192c25a67d6eae4da1775798c4e SHA1 (patch-ac) = 8627c4b530957e056d791a94f935f818970f1dc0 SHA1 (patch-ad) = fd72f95993f62fe44dc21d2e2addc074915b216a diff --git a/audio/tracker/patches/patch-aa b/audio/tracker/patches/patch-aa index 237f247e11a..d74ef2d0885 100644 --- a/audio/tracker/patches/patch-aa +++ b/audio/tracker/patches/patch-aa @@ -1,75 +1,43 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:36:18 agc Exp $ +$NetBSD: patch-aa,v 1.3 2002/12/22 12:22:06 jmmv Exp $ -*** Makefile.orig Tue May 7 19:20:50 1996 ---- Makefile Tue Nov 12 06:56:18 1996 -*************** -*** 20,26 **** - - OPTS=-c - -! PREFIX=/users/algo/espie/pub - # Destination directory for tracker binaries and manpage. - # - # If you don't wish to use the 'make install' and 'make install.man' ---- 20,26 ---- - - OPTS=-c - -! PREFIX?=/users/algo/espie/pub - # Destination directory for tracker binaries and manpage. - # - # If you don't wish to use the 'make install' and 'make install.man' -*************** -*** 166,172 **** - UI_linux = Unix/ - SHELL_linux = /bin/sh - -! CFLAGS_freebsd = -O2 -funroll-loops -finline-functions -fno-strength-reduce - LIBS_freebsd = -lm - AUDIODIR_freebsd=PCux/ - CONFIG_freebsd = PCux/freebsd_ ---- 166,172 ---- - UI_linux = Unix/ - SHELL_linux = /bin/sh - -! CFLAGS_freebsd = -O2 -funroll-loops -finline-functions - LIBS_freebsd = -lm - AUDIODIR_freebsd=PCux/ - CONFIG_freebsd = PCux/freebsd_ -*************** -*** 250,256 **** - display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \ - st_virt$O automaton$O - -! all: tracker${EXE} randomize${EXE} splitmod${EXE} Docs/tracker.text - - config.h: $(CONFIG)config.h - rm -f config.h ---- 250,256 ---- - display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \ - st_virt$O automaton$O - -! all: tracker${EXE} randomize${EXE} - - config.h: $(CONFIG)config.h - rm -f config.h -*************** -*** 272,280 **** - install: - $(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR) - $(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR) -- $(INSTALL) $(INST_BIN_OPT) splitmod $(BIN_DIR) - [ -f ${COMPRESSION_FILE} ] || \ -! $(INSTALL) $(INST_MAN_OPT) compression_methods ${COMPRESSION_FILE} - - # no manpage available, use the texinfo manual. - install.man: ---- 272,279 ---- - install: - $(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR) - $(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR) - [ -f ${COMPRESSION_FILE} ] || \ -! $(INSTALL) $(INST_MAN_OPT) Lib/compression_methods ${COMPRESSION_FILE} - - # no manpage available, use the texinfo manual. - install.man: +--- Makefile.orig Tue May 7 17:20:50 1996 ++++ Makefile +@@ -20,7 +20,7 @@ CC = gcc + + OPTS=-c + +-PREFIX=/users/algo/espie/pub ++PREFIX?=/users/algo/espie/pub + # Destination directory for tracker binaries and manpage. + # + # If you don't wish to use the 'make install' and 'make install.man' +@@ -166,7 +166,7 @@ EXE_linux = + UI_linux = Unix/ + SHELL_linux = /bin/sh + +-CFLAGS_freebsd = -O2 -funroll-loops -finline-functions -fno-strength-reduce ++CFLAGS_freebsd = -O2 -funroll-loops -finline-functions + LIBS_freebsd = -lm + AUDIODIR_freebsd=PCux/ + CONFIG_freebsd = PCux/freebsd_ +@@ -250,7 +250,7 @@ OBJ_SPLITMOD = split$O time$O st_read$O + display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \ + st_virt$O automaton$O + +-all: tracker${EXE} randomize${EXE} splitmod${EXE} Docs/tracker.text ++all: tracker${EXE} randomize${EXE} + + config.h: $(CONFIG)config.h + rm -f config.h +@@ -272,9 +272,8 @@ version.c: Makefile + install: + $(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR) + $(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR) +- $(INSTALL) $(INST_BIN_OPT) splitmod $(BIN_DIR) +- [ -f ${COMPRESSION_FILE} ] || \ +- $(INSTALL) $(INST_MAN_OPT) compression_methods ${COMPRESSION_FILE} ++ [ -f ${COMPRESSION_FILE_EG} ] || \ ++ $(INSTALL) $(INST_MAN_OPT) Lib/compression_methods ${COMPRESSION_FILE_EG} + + # no manpage available, use the texinfo manual. + install.man: -- cgit v1.2.3