ports/116576: maintainer update: math/liborigin

[Max Brazhnikov]

>Number:         116576
>Category:       ports
>Synopsis:       maintainer update: math/liborigin
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 23 09:30:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 6.2-STABLE FreeBSD 6.2-STABLE #0: Thu Aug  9 00:11:48 MSD 2007     root at luna.dio.ru:/usr/obj/usr/src/sys/LUNA  i386
>Description:
update to 20070821:
1. add conflict to math/labplot (see also ports/116321)
2. remove files/patch-Makefile.LINUX
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN --exclude=CVS /usr/ports/math/liborigin/Makefile /home/makc/porting/ports/math/liborigin/Makefile
--- /usr/ports/math/liborigin/Makefile	2007-06-15 13:36:37.000000000 +0400
+++ /home/makc/porting/ports/math/liborigin/Makefile	2007-09-23 13:06:12.000000000 +0400
@@ -6,25 +6,33 @@
 #
 
 PORTNAME=	liborigin
-PORTVERSION=	20070529
+PORTVERSION=	20070821
 CATEGORIES=	math
 MASTER_SITES=	SF
+DISTNAME=	${PORTNAME}-2007-08-21
 
 MAINTAINER=	makc at issp.ac.ru
 COMMENT=	Tools for importing OriginLab .OPJ files
 
+CONFLICTS=	LabPlot-*
+
 PLIST_FILES=	bin/opj2dat \
 		include/OPJFile.h \
 		lib/liborigin.so \
 		lib/liborigin.so.0
 
 USE_LDCONFIG=	yes
-WRKSRC=	${WRKDIR}/${PORTNAME}
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|g++|${CXX}|; \
+		s|^\(CFLAGS.*=\)|\1${CXXFLAGS} |' \
+		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/opj2dat ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/OPJFile.h ${PREFIX}/include/
-	${INSTALL_PROGRAM} ${WRKSRC}/liborigin.so ${PREFIX}/lib/liborigin.so.0
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/liborigin.so.0.0.3 ${PREFIX}/lib/liborigin.so.0
 	${LN} -fs ${PREFIX}/lib/liborigin.so.0 ${PREFIX}/lib/liborigin.so
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/math/liborigin/distinfo /home/makc/porting/ports/math/liborigin/distinfo
--- /usr/ports/math/liborigin/distinfo	2007-06-15 13:36:37.000000000 +0400
+++ /home/makc/porting/ports/math/liborigin/distinfo	2007-09-23 12:36:09.000000000 +0400
@@ -1,3 +1,3 @@
-MD5 (liborigin-20070529.tar.gz) = fee326e07c4e4e40f339a241d38d3545
-SHA256 (liborigin-20070529.tar.gz) = b84f0afa3a24798be3a358fe5aaa9ba50d2eec1a02aff69bda7a9f138fad9277
-SIZE (liborigin-20070529.tar.gz) = 29402
+MD5 (liborigin-2007-08-21.tar.gz) = c08c5c5656e9bcf15107185d95e868d5
+SHA256 (liborigin-2007-08-21.tar.gz) = 7efe0fcbddc44c5d66b34ebb9bad6662864b919ba5b3ee166c991f554fc179f9
+SIZE (liborigin-2007-08-21.tar.gz) = 45977
diff -ruN --exclude=CVS /usr/ports/math/liborigin/files/patch-Makefile.LINUX /home/makc/porting/ports/math/liborigin/files/patch-Makefile.LINUX
--- /usr/ports/math/liborigin/files/patch-Makefile.LINUX	2007-06-15 13:36:38.000000000 +0400
+++ /home/makc/porting/ports/math/liborigin/files/patch-Makefile.LINUX	1970-01-01 03:00:00.000000000 +0300
@@ -1,16 +0,0 @@
---- ./Makefile.LINUX.orig	Tue May 29 12:38:51 2007
-+++ ./Makefile.LINUX	Sat Jun  2 13:46:24 2007
-@@ -6,11 +6,10 @@
- all : opj2dat $(TARGET).so
- 
- $(TARGET).so : OPJFile.cpp OPJFile.h
--	$(CC) -c $(CFLAGS) OPJFile.cpp -o OPJFile.o
--	$(CC) $(LFLAGS) -o $(TARGET).so.0.0.3 OPJFile.o
-+	${CXX} ${CXXFLAGS} -shared -fPIC OPJFile.cpp -o liborigin.so
- 
- opj2dat: opj2dat.cpp OPJFile.cpp
--	g++ -o opj2dat opj2dat.cpp OPJFile.cpp
-+	${CXX} ${CXXFLAGS} -o opj2dat opj2dat.cpp OPJFile.cpp
- 
- clean :
- 	rm -f *~ *.o opj2dat $(TARGET).so*


>Release-Note:
>Audit-Trail:
>Unformatted: