- Update to 1.4

PR:		ports/61271
Submitted by:	Vincent Tantardini <vinc@FreeBSD-fr.org>

6 files changed, 14 insertions, 41 deletions

diff --git a/devel/picprog/Makefile b/devel/picprog/Makefile
index 371b3029a901..fd0b9372a73e 100644
--- a/devel/picprog/Makefile
+++ b/devel/picprog/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	picprog
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.4
 CATEGORIES=	devel
 MASTER_SITES=	http://hyvatti.iki.fi/~jaakko/pic/
 
@@ -19,7 +18,7 @@ USE_GETOPT_LONG=	yes
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		picprog.1
-DOCS=		README picprog.html *.gif
+DOCS=		README picprog.html *.jpg *.png
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/picprog ${PREFIX}/bin
diff --git a/devel/picprog/distinfo b/devel/picprog/distinfo
index 78f480406b2b..6e85ef770895 100644
--- a/devel/picprog/distinfo
+++ b/devel/picprog/distinfo
@@ -1 +1 @@
-MD5 (picprog-1.1.tar.gz) = 9bbb81b7557037aa436f8652c28237e1
+MD5 (picprog-1.4.tar.gz) = 98d8fb42f92b57ea2114033a3f207706
diff --git a/devel/picprog/files/patch-Makefile b/devel/picprog/files/patch-Makefile
index 29adc16ed361..d67cea131fd9 100644
--- a/devel/picprog/files/patch-Makefile
+++ b/devel/picprog/files/patch-Makefile
@@ -1,27 +1,26 @@
---- Makefile.orig	Thu Feb  7 13:33:59 2002
-+++ Makefile	Tue Apr 29 02:57:00 2003
+--- Makefile.orig	Mon Jan 12 22:42:23 2004
++++ Makefile	Mon Jan 12 22:44:01 2004
 @@ -26,10 +26,6 @@
  
  # Please use a reasonably recent GNU make.
  
 -CXX=g++
 -CXXFLAGS=-g -O2 -Wall -W -Wwrite-strings -Wmissing-prototypes
--LDFLAGS=
+-LDFLAGS=-g
 -
  OBJS=main.o picport.o hexfile.o program.o
  PROG=picprog
  
-@@ -38,6 +34,9 @@
+@@ -37,6 +33,8 @@
+ 
  $(PROG): $(OBJS)
  	$(CXX) $(LDFLAGS) $(OBJS) -o $@
- 
 +.cc.o:
 +	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $>
-+
+ 
  dep:
  	$(CXX) -M $(CXXFLAGS) *.cc > .depend
- 
-@@ -55,10 +54,3 @@
+@@ -55,10 +53,3 @@
  install: all
  	install -c -o 0 -g 0 -m 755 $(PROG) /usr/local/bin/
  	install -c -o 0 -g 0 -m 644 *.1 /usr/local/man/man1/
diff --git a/devel/picprog/files/patch-hexfile.h b/devel/picprog/files/patch-hexfile.h
deleted file mode 100644
index 6a825944f086..000000000000
--- a/devel/picprog/files/patch-hexfile.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- hexfile.h.orig	Tue Nov 19 12:49:44 2002
-+++ hexfile.h	Tue Nov 19 12:50:20 2002
-@@ -43,10 +43,11 @@
- #ifndef H_HEXFILE
- #define H_HEXFILE
- 
--#include <fstream.h>
-+#include <fstream>
- 
- #include "picport.h"
- 
-+using namespace std;
- class hexfile {
-   static const int size = 0x4000;
-   short pgm [size];
diff --git a/devel/picprog/files/patch-picport.cc b/devel/picprog/files/patch-picport.cc
deleted file mode 100644
index 914ebda6a443..000000000000
--- a/devel/picprog/files/patch-picport.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- picport.cc.orig	Tue Nov 19 12:52:11 2002
-+++ picport.cc	Tue Nov 19 12:52:20 2002
-@@ -192,7 +192,7 @@
- 
- // -1 == error, no programmer present
- 
--int picport::command (enum commands comm, int data = 0)
-+int picport::command (enum commands comm, int data)
- {
-   int tmp1, tmp2;
- 
diff --git a/devel/picprog/pkg-plist b/devel/picprog/pkg-plist
index 891ed9864df3..677a3314f6de 100644
--- a/devel/picprog/pkg-plist
+++ b/devel/picprog/pkg-plist
@@ -1,7 +1,8 @@
 bin/picprog
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/anybrowser3.gif
-%%PORTDOCS%%%%DOCSDIR%%/jdm84pcb3.gif
-%%PORTDOCS%%%%DOCSDIR%%/jdm84new.gif
+%%PORTDOCS%%%%DOCSDIR%%/adapter.jpg
+%%PORTDOCS%%%%DOCSDIR%%/anybrowser3.png
+%%PORTDOCS%%%%DOCSDIR%%/jdm84ne1.png
+%%PORTDOCS%%%%DOCSDIR%%/jdm84pcb4.png
 %%PORTDOCS%%%%DOCSDIR%%/picprog.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%