diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2013-05-02 19:34:48 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2013-05-02 19:34:48 +0000 |
| commit | f10c69221922fb70167df2ad002157d8f692a977 (patch) | |
| tree | 64a7dc961b5a7f1f521018a5bf1ad14d6d88899d /print | |
| parent | 7d888918b9c6557dba1f63e1623457f38e15899a (diff) | |
| download | ports-f10c69221922fb70167df2ad002157d8f692a977.tar.gz ports-f10c69221922fb70167df2ad002157d8f692a977.zip | |
- make bsdpatch happy
PR: 178220
- merge and cleanup patches
Notes
Notes:
svn path=/head/; revision=317141
Diffstat (limited to 'print')
| -rw-r--r-- | print/a2ps/files/patch-contrib-emacs-Makefile.in | 4 | ||||
| -rw-r--r-- | print/a2ps/files/patch-lib-xgethostname.c | 19 | ||||
| -rw-r--r-- | print/a2ps/files/patch-localealias.c (renamed from print/a2ps/files/patch-intl-localealias.c) | 0 | ||||
| -rw-r--r-- | print/a2ps/files/patch-ogonkify-Makefile.in (renamed from print/a2ps/files/patch-ad) | 0 | ||||
| -rw-r--r-- | print/a2ps/files/patch-options.c (renamed from print/a2ps/files/patch-ae) | 0 | ||||
| -rw-r--r-- | print/a2ps/files/patch-xgethostname.c | 24 |
6 files changed, 22 insertions, 25 deletions
diff --git a/print/a2ps/files/patch-contrib-emacs-Makefile.in b/print/a2ps/files/patch-contrib-emacs-Makefile.in index c1dab47d2a50..9befc5690773 100644 --- a/print/a2ps/files/patch-contrib-emacs-Makefile.in +++ b/print/a2ps/files/patch-contrib-emacs-Makefile.in @@ -1,6 +1,6 @@ Index: contrib/emacs/Makefile.in ---- Makefile.in.orig 2011-09-27 15:17:26.000000000 +0900 -+++ Makefile.in 2011-09-27 15:18:10.000000000 +0900 +--- contrib/emacs/Makefile.in.orig 2011-09-27 15:17:26.000000000 +0900 ++++ contrib/emacs/Makefile.in 2011-09-27 15:18:10.000000000 +0900 @@ -159,8 +159,9 @@ install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES) diff --git a/print/a2ps/files/patch-lib-xgethostname.c b/print/a2ps/files/patch-lib-xgethostname.c deleted file mode 100644 index 06312ddf88e3..000000000000 --- a/print/a2ps/files/patch-lib-xgethostname.c +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/xgethostname.c.orig Tue Nov 20 20:26:31 2001 -+++ lib/xgethostname.c Tue Nov 20 20:26:03 2001 -@@ -21,6 +21,7 @@ - # include <config.h> - #endif - -+#include <sys/param.h> - #include <sys/types.h> - - #include <errno.h> -@@ -38,7 +39,7 @@ - int gethostname (); - - #ifndef INITIAL_HOSTNAME_LENGTH --# define INITIAL_HOSTNAME_LENGTH 34 -+# define INITIAL_HOSTNAME_LENGTH MAXHOSTNAMELEN - #endif - - char * diff --git a/print/a2ps/files/patch-intl-localealias.c b/print/a2ps/files/patch-localealias.c index 074a19569ca5..074a19569ca5 100644 --- a/print/a2ps/files/patch-intl-localealias.c +++ b/print/a2ps/files/patch-localealias.c diff --git a/print/a2ps/files/patch-ad b/print/a2ps/files/patch-ogonkify-Makefile.in index 4b8428030547..4b8428030547 100644 --- a/print/a2ps/files/patch-ad +++ b/print/a2ps/files/patch-ogonkify-Makefile.in diff --git a/print/a2ps/files/patch-ae b/print/a2ps/files/patch-options.c index e85e42c0dc42..e85e42c0dc42 100644 --- a/print/a2ps/files/patch-ae +++ b/print/a2ps/files/patch-options.c diff --git a/print/a2ps/files/patch-xgethostname.c b/print/a2ps/files/patch-xgethostname.c index bfc7c33e0a6d..10246118e252 100644 --- a/print/a2ps/files/patch-xgethostname.c +++ b/print/a2ps/files/patch-xgethostname.c @@ -1,6 +1,23 @@ ---- lib/xgethostname.c Tue Sep 4 00:51:26 2001 -+++ lib/xgethostname.c.new Tue Sep 4 00:55:39 2001 -@@ -63,7 +63,7 @@ +--- lib/xgethostname.c.orig Tue Sep 4 00:51:26 2001 ++++ lib/xgethostname.c Tue Sep 4 00:55:39 2001 +@@ -21,6 +21,7 @@ + # include <config.h> + #endif + ++#include <sys/param.h> + #include <sys/types.h> + + #include <errno.h> +@@ -38,7 +39,7 @@ + int gethostname (); + + #ifndef INITIAL_HOSTNAME_LENGTH +-# define INITIAL_HOSTNAME_LENGTH 34 ++# define INITIAL_HOSTNAME_LENGTH MAXHOSTNAMELEN + #endif + + char * +@@ -63,7 +64,7 @@ if (err == 0 && hostname[k] == '\0') break; #ifdef ENAMETOOLONG @@ -9,4 +26,3 @@ error (EXIT_FAILURE, errno, "gethostname"); #endif size *= 2; - |