Version numbering howto

[Michael Reifenberger]

Hi,
under ports/net/nitpicker we have Version 1.23.
Now there is a upgrade available for this software.
The author wants to go to a versionnumber 1.2.1 though
(1.23 was an internal revision number)

Is it possible to migrate vom 1.23 -> 1.2.1 without grief?
Or do I have to use somthing like PORTEPOCH...

Patch (w/o PORTEPOCH) is attached.

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/nitpicker/Makefile,v
retrieving revision 1.1
diff -u -p -u -r1.1 Makefile
--- Makefile	22 May 2003 22:39:53 -0000	1.1
+++ Makefile	23 Aug 2003 08:48:55 -0000
@@ -6,15 +6,15 @@
 #

 PORTNAME=	nitpicker
-PORTVERSION=	1.23
+PORTVERSION=	1.2.1
 CATEGORIES=	net
 MASTER_SITES=	http://nitpicker.de/
-DISTNAME= Nitpicker-${PORTVERSION}
+DISTNAME= nitpicker-${PORTVERSION}

 MAINTAINER=	mr at freebsd.org
 COMMENT=	IP flow Accounting tools

-WRKSRC= ${WRKDIR}/Nitpicker
+#WRKSRC= ${WRKDIR}/Nitpicker

 NO_MAN= YES

Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net/nitpicker/distinfo,v
retrieving revision 1.1
diff -u -p -u -r1.1 distinfo
--- distinfo	22 May 2003 22:39:53 -0000	1.1
+++ distinfo	23 Aug 2003 08:48:55 -0000
@@ -1 +1 @@
-MD5 (Nitpicker-1.23.tar.gz) = 55996ce0cb4017bdf91e31ed64fb5da6
+MD5 (nitpicker-1.2.1.tar.gz) = 6f98aca85dcaea8ab3d15f2fcf652521
Index: files/patch-aa
===================================================================
RCS file: /home/pcvs/ports/net/nitpicker/files/patch-aa,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-aa
--- files/patch-aa	22 May 2003 22:39:53 -0000	1.1
+++ files/patch-aa	23 Aug 2003 08:48:55 -0000
@@ -1,7 +1,13 @@
---- Makefile.old	Thu May 22 23:59:01 2003
-+++ Makefile	Thu May 22 23:59:04 2003
-@@ -1,3 +1,3 @@
--TARGET: tools nitpicker
-+all: tools nitpicker
+--- src/Makefile.orig	Sat Aug 23 10:37:21 2003
++++ src/Makefile	Sat Aug 23 10:38:52 2003
+@@ -1,8 +1,8 @@
+ TARGET = nitpicker

- tools: dumpit parse_flowfile
+-CC = gcc
++CC = cc
+ INCLUDES = -I../include -I/usr/pkg/include -I..
+ LIBS     = -lpcap
+-CFLAGS   = -pg -Wall -g $(INCLUDES) -pthread
++CFLAGS   += $(INCLUDES) -pthread
+ PREFIX   = /usr/local/
+ INCDIR= ${.CURDIR}/../include
Index: files/patch-ab
===================================================================
RCS file: /home/pcvs/ports/net/nitpicker/files/patch-ab,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-ab
--- files/patch-ab	22 May 2003 22:39:53 -0000	1.1
+++ files/patch-ab	23 Aug 2003 08:48:55 -0000
@@ -1,10 +1,11 @@
---- tools/parse_flowfile/Makefile.old	Thu May 22 23:59:52 2003
-+++ tools/parse_flowfile/Makefile	Fri May 23 00:00:16 2003
-@@ -4,4 +4,7 @@
- 	@cd src; make all;
-
-+install:
-+	@cd src; make install
-+
- clean:
- 	@cd src; make clean;
+--- tools/parse_flowfile/src/Makefile.orig	Sat Aug 23 10:41:23 2003
++++ tools/parse_flowfile/src/Makefile	Sat Aug 23 10:42:27 2003
+@@ -3,6 +3,6 @@
+ LIBS     =
+ INCLUDES = -I../include -I../../../include
+-CFLAGS   = -Wall -g $(INCLUDES)
+-CC = g++
++CFLAGS   += $(INCLUDES)
++CC = c++
+ INCDIR= ${.CURDIR}/../include
+ .PATH: ${INCDIR}

Bye!
----
Michael Reifenberger
^.*Plaut.*$, IT, R/3 Basis, GPS