[Gsrc-commit] /srv/bzr/gsrc/trunk r1124: clean up hp2xx and fix build and install

[Brandon Invergo]

------------------------------------------------------------
revno: 1124
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-11 17:15:05 +0100
message:
  clean up hp2xx and fix build and install
added:
  gnu/hp2xx/config.mk
  gnu/hp2xx/files/
  gnu/hp2xx/files/fix-build.diff
  gnu/hp2xx/files/fix-install.diff
modified:
  gnu/hp2xx/Makefile

=== modified file 'gnu/hp2xx/Makefile'
--- a/gnu/hp2xx/Makefile        2010-06-15 13:35:43 +0000
+++ b/gnu/hp2xx/Makefile        2012-11-11 16:15:05 +0000
@@ -1,16 +1,30 @@
 GARNAME = hp2xx
 GARVERSION = 3.4.4
+HOME_URL = http://www.gnu.org/software/hp2xx
+DESCRIPTION = Convert HP-GL vector graphics to other formats
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = hp2xx/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
-# SIGFILES = 
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/hp2xx
-# DESCRIPTION = 
-
-include ../../gar.lib/auto.mk
+SIGFILES = 
+PATCHFILES = fix-install.diff fix-build.diff
+BUILD_SCRIPTS = $(WORKSRC)/sources/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/sources/Makefile
+
+BUILDDEPS = 
+LIBDEPS = zlib libpng
+
+######################################################################
+
+include ../../gar.mk
+include config.mk
+
+build-%/Makefile:
+       $(BUILD_ENV) $(MAKE) -C $* $(BUILD_ARGS)
+       $(MAKECOOKIE)
+
+install-%/Makefile:
+       $(MAKE) -C $* install $(INSTALL_ARGS)
+       $(MAKECOOKIE)

=== added file 'gnu/hp2xx/config.mk'
--- a/gnu/hp2xx/config.mk       1970-01-01 00:00:00 +0000
+++ b/gnu/hp2xx/config.mk       2012-11-11 16:15:05 +0000
@@ -0,0 +1,4 @@
+## Configuration options for hp2xx ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=

=== added directory 'gnu/hp2xx/files'
=== added file 'gnu/hp2xx/files/fix-build.diff'
--- a/gnu/hp2xx/files/fix-build.diff    1970-01-01 00:00:00 +0000
+++ b/gnu/hp2xx/files/fix-build.diff    2012-11-11 16:15:05 +0000
@@ -0,0 +1,20 @@
+diff -x config.log -x config.status -ru work/hp2xx-3.4.4/sources/png.c 
work/hp2xx-3.4.4/sources/png.c
+--- work/hp2xx-3.4.4/sources/png.c     2003-06-21 17:31:51.000000000 +0200
++++ work/hp2xx-3.4.4/sources/png.c     2012-11-11 16:45:46.510233531 +0100
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include "to_png.h"
+ #include <png.h>
++#include <zlib.h>
+ 
+ #define PDNCOL 256
+ 
+@@ -36,7 +37,7 @@
+       }
+ 
+       /* set up error handlimg for libpng */
+-      if (setjmp(png_ptr->jmpbuf)) {
++      if (setjmp(png_jmpbuf(png_ptr))) {
+               png_destroy_write_struct(&png_ptr, &info_ptr);
+               return;
+       }

=== added file 'gnu/hp2xx/files/fix-install.diff'
--- a/gnu/hp2xx/files/fix-install.diff  1970-01-01 00:00:00 +0000
+++ b/gnu/hp2xx/files/fix-install.diff  2012-11-11 16:15:05 +0000
@@ -0,0 +1,51 @@
+diff -x config.log -x config.status -ru tmp/hp2xx-3.4.4/sources/Makefile 
work/hp2xx-3.4.4/sources/Makefile
+--- tmp/hp2xx-3.4.4/sources/Makefile   2003-06-21 17:16:34.000000000 +0200
++++ work/hp2xx-3.4.4/sources/Makefile  2012-11-11 17:03:32.633763450 +0100
+@@ -26,7 +26,9 @@
+ # Utilities etc.:
+ #
+ SHELL    = /bin/sh
+-
++INSTALL  = install
++INSTALL_BIN = $(INSTALL) -m755 -D
++INSTALL_DATA =$(INSTALL) -m644 -D
+ CHMOD    = chmod
+ CP       = cp
+ MKINFO   = makeinfo
+@@ -35,12 +37,13 @@
+ 
+ # Installation sites (GNU conventions):
+ #
++DESTDIR  =
+ prefix   = /usr/local
+-bindir   = $(prefix)/bin
+-includedir = $(prefix)/include
+-mandir   = $(prefix)/man
++bindir   = ${prefix}/bin
++includedir = ${prefix}/include
++mandir   = ${prefix}/man
+ man1dir  = $(mandir)/man1
+-infodir  = $(prefix)/info
++infodir  = ${prefix}/info
+ 
+ # CC and CFLAGS set for gcc, but any ANSI-C compiler should work.
+ # For non-gcc compilers, simply set CFLAGS = -O (to start with)
+@@ -331,14 +334,12 @@
+ 
+ install-bin:  $(PROGRAM)
+               -$(STRIP) $(PROGRAM)
+-              -$(CP) $(PROGRAM) $(bindir)
+-              -$(CHMOD) 755 $(bindir)/$(PROGRAM)
++              $(INSTALL_BIN) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+ 
+ install-info: hp2xx.info
+-              -$(CP) hp2xx.info $(infodir)
+-              -$(CHMOD) 644 $(infodir)/hp2xx.info
++              $(INSTALL_DATA) hp2xx.info $(DESTDIR)$(infodir)/hp2xx.info
+ 
+ install-man:  ../doc/hp2xx.1
+-              -$(CP) ../doc/hp2xx.1 $(man1dir)
+-              -$(CHMOD) 644 $(man1dir)/hp2xx.1
++              $(INSTALL_DATA) ../doc/hp2xx.1 $(DESTDIR)$(man1dir)/hp2xx.1
++
+