summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorijliao <ijliao@FreeBSD.org>2002-02-10 02:58:12 +0000
committerijliao <ijliao@FreeBSD.org>2002-02-10 02:58:12 +0000
commit0bd08f818f6abae513883637923453f1b9fd0826 (patch)
tree58b8315b05488aa811e28c743c52fd3e52ef5292
parent3ee2baf7a6ee783ae4c44a61b1c75d6156725ea0 (diff)
downloadFreeBSD-ports-0bd08f818f6abae513883637923453f1b9fd0826.zip
FreeBSD-ports-0bd08f818f6abae513883637923453f1b9fd0826.tar.gz
upgrade to 3.4.1
PR: 34773 Submitted by: Ports Fury
-rw-r--r--print/hp2xx/Makefile13
-rw-r--r--print/hp2xx/distinfo2
-rw-r--r--print/hp2xx/files/patch-aa197
-rw-r--r--print/hp2xx/files/patch-ab71
-rw-r--r--print/hp2xx/files/patch-ac44
-rw-r--r--print/hp2xx/pkg-descr2
6 files changed, 149 insertions, 180 deletions
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index 4bc4d85..d24b68c 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -6,19 +6,20 @@
#
PORTNAME= hp2xx
-PORTVERSION= 3.20
+PORTVERSION= 3.4.1
+PORTEPOCH= 1
CATEGORIES= print x11
-MASTER_SITES= ftp://ftp.rz.uni-duesseldorf.de/pub/graphics/ \
- ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
-DISTNAME= hp2xx-3.20-png
+MASTER_SITES= ${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
-LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
+ tiff.4:${PORTSDIR}/graphics/tiff
WRKSRC= ${WRKDIR}/${DISTNAME}/sources
USE_XLIB= yes
-MAKEFILE= makefile
+
MAN1= hp2xx.1
post-install:
diff --git a/print/hp2xx/distinfo b/print/hp2xx/distinfo
index 042d2ca..90f33ee 100644
--- a/print/hp2xx/distinfo
+++ b/print/hp2xx/distinfo
@@ -1 +1 @@
-MD5 (hp2xx-3.20-png.tar.gz) = 60f5bffe04c747296b6e8ee930b280e9
+MD5 (hp2xx-3.4.1.tar.gz) = f5a991b57a2a26935f85eb348cd3967a
diff --git a/print/hp2xx/files/patch-aa b/print/hp2xx/files/patch-aa
index 326736f..0948ece 100644
--- a/print/hp2xx/files/patch-aa
+++ b/print/hp2xx/files/patch-aa
@@ -1,87 +1,110 @@
-*** ./makefile.orig Mon Dec 1 03:22:14 1997
---- ./makefile Sun Jan 17 14:39:04 1999
-***************
-*** 34,40 ****
-
- # Installation sites (GNU conventions):
- #
-! prefix = /usr/local
- bindir = $(prefix)/bin
- includedir = $(prefix)/include
- mandir = $(prefix)/man
---- 34,40 ----
-
- # Installation sites (GNU conventions):
- #
-! prefix = ${PREFIX}
- bindir = $(prefix)/bin
- includedir = $(prefix)/include
- mandir = $(prefix)/man
-***************
-*** 45,53 ****
- # For non-gcc compilers, simply set CFLAGS = -O (to start with)
- #
- #CC = gcc
-! #CFLAGS = -O2 -Wall -ansi -fstrength-reduce -finline-functions
-! CC = cc
-! CFLAGS = -O
-
- #LFLAGS = # only sometimes needed; see below for examples
- #CPPFLAGS = -I. # only sometimes needed; see below for examples
---- 45,53 ----
- # For non-gcc compilers, simply set CFLAGS = -O (to start with)
- #
- #CC = gcc
-! CFLAGS += -Wall -ansi
-! #CC = cc
-! #CFLAGS = -O
-
- #LFLAGS = # only sometimes needed; see below for examples
- #CPPFLAGS = -I. # only sometimes needed; see below for examples
-***************
-*** 56,63 ****
- #
- # PNG test setup (for build without installed libpng/libz)
- #
-! LFLAGS = -L../../libpng-0.96 -L../../zlib-1.0.4
-! CPPFLAGS = -I. -I../../libpng-0.96 -I../../zlib-1.0.4
- BINDCMD =
-
- #############################################################################
---- 56,65 ----
- #
- # PNG test setup (for build without installed libpng/libz)
- #
-! #LFLAGS = -L../../libpng-0.96 -L../../zlib-1.0.4
-! LFLAGS = -L${X11BASE}/lib -L$(prefix)/lib
-! #CPPFLAGS = -I. -I../../libpng-0.96 -I../../zlib-1.0.4
-! CPPFLAGS = -I. -I${X11BASE}/include -I$(prefix)/include
- BINDCMD =
-
- #############################################################################
-***************
-*** 208,215 ****
- PROGRAM = hp2xx
-
- default:
-! @echo "This makefile needs manual configuration! Edit it now!
-! @echo "After configuration, you may use the following commands:
- @echo ""
- @echo "make all Compile everything"
- @echo "make check Run a color application in preview mode"
---- 210,217 ----
- PROGRAM = hp2xx
-
- default:
-! @echo "This makefile needs manual configuration! Edit it now!"
-! @echo "After configuration, you may use the following commands:"
- @echo ""
- @echo "make all Compile everything"
- @echo "make check Run a color application in preview mode"
-***************
-*** 306,309 ****
- install-man: ../doc/hp2xx.1
- $(CP) ../doc/hp2xx.1 $(man1dir)
- $(CHMOD) 644 $(man1dir)/hp2xx.1
--
---- 308,310 ----
+--- Makefile.orig Sun Dec 30 20:17:58 2001
++++ Makefile Wed Jan 30 20:59:01 2002
+@@ -35,7 +35,7 @@
+
+ # Installation sites (GNU conventions):
+ #
+-prefix = /usr/local
++prefix = ${PREFIX}
+ bindir = $(prefix)/bin
+ includedir = $(prefix)/include
+ mandir = $(prefix)/man
+@@ -45,12 +45,12 @@
+ # CC and CFLAGS set for gcc, but any ANSI-C compiler should work.
+ # For non-gcc compilers, simply set CFLAGS = -O (to start with)
+ #
+-CC = gcc
+-CFLAGS = -O2 -g -I/usr/X11R6/include $(DEFINES) $(EX_DEFS) -Wall -pedantic -Wuninitialized -Wunused -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes
++#CC = gcc
++#CFLAGS = -O2 -g -I/usr/X11R6/include $(DEFINES) $(EX_DEFS) -Wall -pedantic -Wuninitialized -Wunused -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes
+
+ #CFLAGS = +O1 -Aa -D_HPUX_SOURCE -DSYSV -I/usr/include/X11R5 -I/usr/include/X11R4 $(DEFINES)
+
+-LFLAGS = -L/usr/X11R6/lib # only sometimes needed; see below for examples
++#LFLAGS = -L/usr/X11R6/lib # only sometimes needed; see below for examples
+ CPPFLAGS = -I. # only sometimes needed; see below for examples
+ BINDCMD = # only needed for EMX and DJGPP DOS extenders
+
+@@ -65,9 +65,9 @@
+ # add -lpng -lz for PNG support
+ # and/or -ltiff for TIFF
+ #
+-DEFINES = -DUNIX -DHAS_UNIX_X11
++DEFINES = -DUNIX -DHAS_UNIX_X11 -I${X11BASE}/include -I${LOCALBASE}/include
+ PREVIEWER = to_x11
+-ALL_LIBS = -L/usr/lib/X11R6 -lX11 -lm
++ALL_LIBS = -L${X11BASE}/lib -lX11 -lm -L${LOCALBASE}/lib -ltiff -lpng -lz
+ #
+ # Generic UNIX, no previewer
+ #
+@@ -179,19 +179,19 @@
+ #
+ # Epson Esc/P2 support
+ #
+-#EX_SRC += to_escp2.c
+-#EX_OBJ += to_escp2.o
+-#EX_DEFS += -DEPSON
++EX_SRC += to_escp2.c
++EX_OBJ += to_escp2.o
++EX_DEFS += -DEPSON
+ #
+ # Include PNG support:
+-#EX_SRC += png.c to_png.c
+-#EX_OBJ += png.o to_png.o
+-#EX_DEFS += -DPNG
++EX_SRC += png.c to_png.c
++EX_OBJ += png.o to_png.o
++EX_DEFS += -DPNG
+ #
+ # Include TIFF support:
+-#EX_SRC += to_tif.c
+-#EX_OBJ += to_tif.o
+-#EX_DEFS += -DTIF
++EX_SRC += to_tif.c
++EX_OBJ += to_tif.o
++EX_DEFS += -DTIF
+ #
+ # Include ATARI extras:
+ # EX_SRC += to_pic.c to_pac.c
+@@ -224,7 +224,8 @@
+
+ $(PROGRAM): $(OBJS)
+ $(CC) $(LFLAGS) $(OBJS) $(ALL_LIBS) -o $(PROGRAM)
+- $(BINDCMD)
++
++all: $(PROGRAM) hp2xx.info
+
+ default:
+ @echo "This makefile needs manual configuration! Edit it now!
+@@ -248,9 +249,9 @@
+ # #
+ #########################################################################
+
+-# .c.o: $< $(COMMON_INCS)
+-# -$(RMCMD) $@
+-# $(CC) $(DEFINES) $(EX_DEFS) $(ALL_CFLAGS) $(CPPFLAGS) $<
++.c.o: $< $(COMMON_INCS)
++ -$(RMCMD) $@
++ $(CC) $(DEFINES) $(EX_DEFS) $(ALL_CFLAGS) $(CPPFLAGS) $<
+
+
+ #########################################################################
+@@ -307,15 +308,11 @@
+ install: install-bin install-info install-man
+
+ install-bin: $(PROGRAM)
+- -$(STRIP) $(PROGRAM)
+- -$(CP) $(PROGRAM) $(bindir)
+- -$(CHMOD) 755 $(bindir)/$(PROGRAM)
++ ${BSD_INSTALL_PROGRAM} $(PROGRAM) $(bindir)
+
+ install-info: hp2xx.info
+- -$(CP) hp2xx.info $(infodir)
+- -$(CHMOD) 644 $(infodir)/hp2xx.info
++ ${BSD_INSTALL_DATA} hp2xx.info $(infodir)
+
+ install-man: ../doc/hp2xx.1
+- -$(CP) ../doc/hp2xx.1 $(man1dir)
+- -$(CHMOD) 644 $(man1dir)/hp2xx.1
++ ${BSD_INSTALL_MAN} ../doc/hp2xx.1 $(man1dir)
+
diff --git a/print/hp2xx/files/patch-ab b/print/hp2xx/files/patch-ab
index 259d006..cb74921 100644
--- a/print/hp2xx/files/patch-ab
+++ b/print/hp2xx/files/patch-ab
@@ -1,42 +1,29 @@
-*** ../doc/hp2xxinf.tex.orig Tue Oct 24 15:54:03 1995
---- ../doc/hp2xxinf.tex Sun Jan 17 14:35:52 1999
-***************
-*** 4,9 ****
---- 4,16 ----
- @setfilename hp2xx.info
- @settitle HP2XX, A HP-GL Converter
- @setchapternewpage odd
-+ @dircategory Miscellaneous
-+ @direntry
-+ * HP2XX:(hp2xx). Conversion of HP-GL graphics into raster and
-+ vector graphics formats
-+ @end direntry
-+
-+
- @c @smallbook
- @c @cropmarks
- @c %**end of header
-***************
-*** 30,43 ****
-
- @c THIS MANUAL REQUIRES TEXINFO-2 macros and info-makers to format properly.
-
-- @ifinfo
-- @format
-- START-INFO-DIR-ENTRY
-- * HP2XX:(hp2xx). Conversion of HP-GL graphics into raster and
-- * vector graphics formats
-- END-INFO-DIR-ENTRY
-- @end format
-- @end ifinfo
- @c
- @ifinfo
- This file documents the HP-GL converter HP2XX
---- 37,42 ----
-***************
-*** 1594,1597 ****
-
- @contents
- @bye
--
---- 1593,1595 ----
+--- ../doc/hp2xxinf.tex.orig Sun Dec 30 20:18:00 2001
++++ ../doc/hp2xxinf.tex Wed Jan 30 20:01:28 2002
+@@ -5,6 +5,11 @@
+ @setfilename hp2xx.info
+ @settitle HP2XX, A HP-GL Converter
+ @setchapternewpage odd
++@dircategory Miscellaneous
++@direntry
++* HP2XX:(hp2xx). Conversion of HP-GL graphics into raster and
++ vector graphics formats
++@end direntry
+ @c @smallbook
+ @c @cropmarks
+ @c %**end of header
+@@ -35,14 +40,6 @@
+ @c 00/09/20 V 1.2 MK fixed INFO-DIR-ENTRY, updates for 3.4.0
+ @c THIS MANUAL REQUIRES TEXINFO-2 macros and info-makers to format properly.
+
+-@ifinfo
+-@format
+-START-INFO-DIR-ENTRY
+-* HP2XX:(hp2xx). Conversion of HP-GL graphics into raster and
+- vector graphics formats
+-END-INFO-DIR-ENTRY
+-@end format
+-@end ifinfo
+ @c
+ @ifinfo
+ This file documents the HP-GL converter HP2XX
diff --git a/print/hp2xx/files/patch-ac b/print/hp2xx/files/patch-ac
deleted file mode 100644
index d51264c..0000000
--- a/print/hp2xx/files/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-*** ../doc/hp2xx.1.orig Tue Oct 24 15:54:03 1995
---- ../doc/hp2xx.1 Sun Jan 17 15:32:10 1999
-***************
-*** 17,23 ****
- -f char * "" Name of output file. "" = autom., "-" = stdout
- -l char * "" Name of optional log file
- -m char * pre Mode. Valid:
-! mf,cad,em,epic,eps,hpgl,rgip, pcl,pcx,pic,img,pbm, pre
- -p char * 11111111 Pensize(s) [dots] (default), [1/10 mm] (mf, ps).
- Valid: 1 to 8 digits of 0-9 each.
- -P int 0:0 Selected page range (m:n) (0 = 0:0 = all pages)
---- 17,23 ----
- -f char * "" Name of output file. "" = autom., "-" = stdout
- -l char * "" Name of optional log file
- -m char * pre Mode. Valid:
-! cad,em,epic,eps,hpgl,img,mf,pbm,pcl,pcx,png,rgip,pre
- -p char * 11111111 Pensize(s) [dots] (default), [1/10 mm] (mf, ps).
- Valid: 1 to 8 digits of 0-9 each.
- -P int 0:0 Selected page range (m:n) (0 = 0:0 = all pages)
-***************
-*** 150,156 ****
- "pcl" (HP-PCL Level 3 format (suitable for printing on a HP Laserjet II,
- DeskJet, or compatible printer), "img" (GEMs IMG format), "pbm" (Portable
- Bit Map), "pcx" (PC-Paintbrush format, also accepted by MS-Paintbrush /
-! Windows 3.0 and many other PC based pixel renderers), or "rgip" (Uniplex RGIP).
- There is also a preview option "pre" which supports VGA cards (DOS),
- ATARI, AMIGA, X11 servers, and Sunview. Default mode is "pre".
-
---- 150,157 ----
- "pcl" (HP-PCL Level 3 format (suitable for printing on a HP Laserjet II,
- DeskJet, or compatible printer), "img" (GEMs IMG format), "pbm" (Portable
- Bit Map), "pcx" (PC-Paintbrush format, also accepted by MS-Paintbrush /
-! Windows 3.0 and many other PC based pixel renderers), "rgip" (Uniplex RGIP),
-! or "png" (Portable Network Graphics).
- There is also a preview option "pre" which supports VGA cards (DOS),
- ATARI, AMIGA, X11 servers, and Sunview. Default mode is "pre".
-
-***************
-*** 380,383 ****
- .SH SEE ALSO
- .BR bm2font (1),
- F. Sowa's raster-to-TeXfont converter.
--
---- 381,383 ----
diff --git a/print/hp2xx/pkg-descr b/print/hp2xx/pkg-descr
index fecba29..e3bf8e8 100644
--- a/print/hp2xx/pkg-descr
+++ b/print/hp2xx/pkg-descr
@@ -13,3 +13,5 @@ It allows conversion from HPGL to:
pre(view), pcx (PaintBrush-Format), img (GEM),
pic (ATARI bitmap), pbm (Portable Bitmap),
png (Portable Network Graphics), ...
+
+WWW: http://www.gnu.org/software/hp2xx/
OpenPOWER on IntegriCloud