summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-misc/fdutils/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-misc/fdutils/files')
-rw-r--r--app-misc/fdutils/files/fdutils-5.5-destdirfix.patch140
-rw-r--r--app-misc/fdutils/files/fdutils-no-fd.4-manpage.diff12
2 files changed, 152 insertions, 0 deletions
diff --git a/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch b/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
new file mode 100644
index 000000000000..47d1918b1f42
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
@@ -0,0 +1,140 @@
+--- fdutils-5.5/doc/Makefile.in.orig 2005-07-16 19:54:56.000000000 +1000
++++ fdutils-5.5/doc/Makefile.in 2005-07-16 20:00:42.000000000 +1000
+@@ -79,68 +79,68 @@
+
+ # Don't cd, to avoid breaking install-sh references.
+ install-info: info
+- $(top_srcdir)/mkinstalldirs $(infodir)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
+ if test -f fdutils.info; then \
+ for i in fdutils.info*; do \
+- $(INSTALL_DATA) $$i $(infodir)/$$i; \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
+ done; \
+ else \
+ for i in $(srcdir)/fdutils.info*; do \
+- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
+ done; \
+ fi; \
+ if [ -n "$(INSTALL_INFO)" ] ; then \
+ if [ -f $(infodir)/dir.info ] ; then \
+- $(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir.info; \
++ $(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir.info; \
+ fi; \
+ if [ -f $(infodir)/dir ] ; then \
+- $(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir; \
++ $(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir; \
+ fi; \
+ fi
+
+
+
+ install-man:
+- $(top_srcdir)/mkinstalldirs $(mandir1)
+- $(top_srcdir)/mkinstalldirs $(mandir4)
+- $(top_srcdir)/mkinstalldirs $(mandir8)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir1)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir4)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir8)
+ for i in $(MANPAGES1); do \
+ install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+- $(srcdir)/$$i $(mandir1)/$$i; \
++ $(srcdir)/$$i $(DESTDIR)$(mandir1)/$$i; \
+ done
+
+ for i in $(MANPAGES4); do \
+ install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+- $(srcdir)/$$i $(mandir4)/$$i; \
++ $(srcdir)/$$i $(DESTDIR)$(mandir4)/$$i; \
+ done
+
+ # for i in $(MANPAGES8); do \
+ # install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+-# $(srcdir)/$$i $(mandir8)/$$i; \
++# $(srcdir)/$$i $(DESTDIR)$(mandir8)/$$i; \
+ # done
+
+- ( cd $(mandir1); \
+- ln -sf fdmount.1 $(mandir1)/fdumount.1; \
+- ln -sf fdmount.1 $(mandir1)/fdlist.1; \
+- ln -sf fdmount.1 $(mandir1)/fdmountd.1; \
+- ln -sf xdfcopy.1 $(mandir1)/xdfformat.1 \
++ ( cd $(DESTDIR)$(mandir1); \
++ ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdumount.1; \
++ ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdlist.1; \
++ ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdmountd.1; \
++ ln -sf xdfcopy.1 $(DESTDIR)$(mandir1)/xdfformat.1 \
+ )
+
+ install-zman:
+ for i in $(MANPAGES1); do \
+ gzip < $(srcdir)/$$i >_; \
+ install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+- _ $(mandir1)/$$i.gz; \
++ _ $(DESTDIR)$(mandir1)/$$i.gz; \
+ done
+ for i in $(MANPAGES4); do \
+ gzip < $(srcdir)/$$i >_; \
+ install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+- _ $(mandir4)/$$i.gz; \
++ _ $(DESTDIR)$(mandir4)/$$i.gz; \
+ done
+ for i in $(MANPAGES8); do \
+ gzip < $(srcdir)/$$i >_; \
+ install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+- _ $(mandir8)/$$i.gz; \
++ _ $(DESTDIR)$(mandir8)/$$i.gz; \
+ done
+ rm _
+
+--- fdutils-5.5/src/Makefile.in.orig 2005-07-16 19:51:09.000000000 +1000
++++ fdutils-5.5/src/Makefile.in 2005-07-16 19:54:39.000000000 +1000
+@@ -116,27 +116,27 @@
+
+
+ install-conf:
+- $(top_srcdir)/mkinstalldirs $(syconfdir)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(syconfdir)
+ if [ ! -f $(sysconfdir)/mediaprm ] ; then \
+- cp $(srcdir)/mediaprm $(sysconfdir) ; \
++ cp $(srcdir)/mediaprm $(DESTDIR)$(sysconfdir) ; \
+ fi
+
+ install-bin: all
+- $(top_srcdir)/mkinstalldirs $(bindir)
+- $(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(bindir)
+- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(bindir)
+- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(bindir)
+- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(bindir)
+- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(bindir)
+- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(bindir)
+- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(bindir)
+- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(bindir)
+- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(bindir)
+- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(bindir)
+- $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)
+- $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)/fdumount
+- ( cd $(bindir); \
+- ln -sf xdfcopy $(bindir)/xdfformat; \
+- ln -sf fdmount $(bindir)/fdumount; \
+- ln -sf fdmount $(bindir)/fdlist; \
+- ln -sf fdmount $(bindir)/fdmountd )
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++ $(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(DESTDIR)$(bindir)
++ $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(DESTDIR)$(bindir)/fdumount
++ ( cd $(DESTDIR)$(bindir); \
++ ln -sf xdfcopy xdfformat; \
++ ln -sf fdmount fdumount; \
++ ln -sf fdmount fdlist; \
++ ln -sf fdmount fdmountd )
diff --git a/app-misc/fdutils/files/fdutils-no-fd.4-manpage.diff b/app-misc/fdutils/files/fdutils-no-fd.4-manpage.diff
new file mode 100644
index 000000000000..909ecd971da9
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-no-fd.4-manpage.diff
@@ -0,0 +1,12 @@
+diff -urN fdutils-5.4.old/doc/Makefile.in fdutils-5.4/doc/Makefile.in
+--- fdutils-5.4.old/doc/Makefile.in 1999-07-02 15:03:25.000000000 -0700
++++ fdutils-5.4/doc/Makefile.in 2003-12-10 00:24:36.000000000 -0800
+@@ -22,7 +22,7 @@
+ floppycontrol.1 makefloppies.1 xdfcopy.1 fdmount.1 \
+ floppymeter.1 setfdprm.1
+
+-MANPAGES4 = fd.4
++MANPAGES4 =
+ MANPERM = 644
+ UID = root
+ GID = root