Bump to 1.9nb1: Do not install resid header files. Closes pkg/17880.

Also add xplus4 to PLIST.
This commit is contained in:
wiz 2002-08-08 11:59:36 +00:00
parent 7daccf08b5
commit fdfed9c8da
5 changed files with 101 additions and 13 deletions

View file

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.24 2002/04/22 21:02:10 kristerw Exp $
# $NetBSD: Makefile,v 1.25 2002/08/08 11:59:36 wiz Exp $
#
DISTNAME= vice-1.9
PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.funet.fi/pub/cbm/firmware/computers/c64/ \
ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ \

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2002/04/22 21:02:10 kristerw Exp $
@comment $NetBSD: PLIST,v 1.4 2002/08/08 11:59:36 wiz Exp $
bin/c1541
bin/petcat
bin/vsid
@ -6,16 +6,8 @@ bin/x128
bin/x64
bin/xcbm2
bin/xpet
bin/xplus4
bin/xvic
include/resid/envelope.h
include/resid/extfilt.h
include/resid/filter.h
include/resid/pot.h
include/resid/sid.h
include/resid/siddefs.h
include/resid/spline.h
include/resid/voice.h
include/resid/wave.h
@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/vice.info
info/vice.info
info/vice.info-1
@ -197,4 +189,3 @@ share/vice/fonts/vice-cbm.pcf
@dirrm share/vice
@dirrm share/doc/vice
@dirrm share/doc/html/vice
@dirrm include/resid

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.5 2002/04/22 21:02:11 kristerw Exp $
$NetBSD: distinfo,v 1.6 2002/08/08 11:59:36 wiz Exp $
SHA1 (vice-1.9.tar.gz) = 085726784887fe7629a0d5413c6df77c1e8e97ba
Size (vice-1.9.tar.gz) = 3056898 bytes
@ -12,3 +12,5 @@ SHA1 (patch-ab) = 0be2ec8b98a50e5c879095b1d0327c802b7740e2
SHA1 (patch-ac) = 04181c249239e13ad1859532840154499da0fe4c
SHA1 (patch-ad) = ea9f6ebb3696591d1f0c4d496bff41fe1c8a8a73
SHA1 (patch-ae) = 8e595b5b304fe2f3b6084fb30d569d0186d3d0c7
SHA1 (patch-af) = b2c8e616f1000ae635c9b88486725f35bd8dd524
SHA1 (patch-ag) = 2731f8964f29730f91afee81063945f4fa15e8ce

View file

@ -0,0 +1,20 @@
$NetBSD: patch-af,v 1.3 2002/08/08 11:59:37 wiz Exp $
--- src/resid/Makefile.am.orig Sun Mar 4 13:24:35 2001
+++ src/resid/Makefile.am
@@ -6,13 +6,13 @@ libresid_a_SOURCES = sid.cc voice.cc wav
BUILT_SOURCES = $(noinst_DATA:.dat=.cc)
-pkginclude_HEADERS = siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
+noinst_HEADERS = siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
noinst_DATA = wave6581_PST.dat wave6581_PS_.dat wave6581_P_T.dat wave6581__ST.dat wave8580_PST.dat wave8580_PS_.dat wave8580_P_T.dat wave8580__ST.dat
noinst_SCRIPTS = samp2src.pl
-EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS) README.VICE
+EXTRA_DIST = $(noinst_DATA) $(noinst_HEADERS) $(noinst_SCRIPTS) README.VICE
SUFFIXES = .dat

View file

@ -0,0 +1,74 @@
$NetBSD: patch-ag,v 1.3 2002/08/08 11:59:37 wiz Exp $
--- src/resid/Makefile.in.orig Tue Dec 18 22:44:20 2001
+++ src/resid/Makefile.in
@@ -73,13 +73,13 @@ libresid_a_SOURCES = sid.cc voice.cc wav
BUILT_SOURCES = $(noinst_DATA:.dat=.cc)
-pkginclude_HEADERS = siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
+noinst_HEADERS = siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
noinst_DATA = wave6581_PST.dat wave6581_PS_.dat wave6581_P_T.dat wave6581__ST.dat wave8580_PST.dat wave8580_PS_.dat wave8580_P_T.dat wave8580__ST.dat
noinst_SCRIPTS = samp2src.pl
-EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS) README.VICE
+EXTRA_DIST = $(noinst_DATA) $(noinst_HEADERS) $(noinst_SCRIPTS) README.VICE
SUFFIXES = .dat
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -110,7 +110,7 @@ CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
DATA = $(noinst_DATA)
-HEADERS = $(pkginclude_HEADERS)
+HEADERS = $(noinst_HEADERS)
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS THANKS TODO aclocal.m4 configure configure.in \
@@ -179,21 +181,6 @@ libresid.a: $(libresid_a_OBJECTS) $(libr
.cc.o:
$(CXXCOMPILE) -c $<
-install-pkgincludeHEADERS: $(pkginclude_HEADERS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
- @list='$(pkginclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
- done
-
-uninstall-pkgincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- list='$(pkginclude_HEADERS)'; for p in $$list; do \
- rm -f $(DESTDIR)$(pkgincludedir)/$$p; \
- done
-
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -300,20 +325,19 @@ installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am
-install-data-am: install-pkgincludeHEADERS
+install-data-am:
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
-uninstall-am: uninstall-pkgincludeHEADERS
+uninstall-am:
uninstall: uninstall-am
all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
mostlyclean-generic: