diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2008-10-14 20:55:07 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2008-10-14 20:55:07 +0000 |
| commit | c2b39c72217513c44bc3b91cd94b8a3dd3e14ebb (patch) | |
| tree | b0a948fc04314a04f3d74b27cc220614f6fca52b | |
| parent | - Update to 20081015 snapshot (diff) | |
- Don't install .bat file, unbreak
- While here, minor cleanups + remove obsolete 5.x condition
PR: 127386
Submitted by: Stephen Montgomery-Smith <stephen at math dot missouri dot edu>
Notes
Notes:
svn path=/head/; revision=221594
| -rw-r--r-- | graphics/opendx/Makefile | 21 | ||||
| -rw-r--r-- | graphics/opendx/pkg-plist | 2 |
2 files changed, 8 insertions, 15 deletions
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index baf53efd4af5..eed26c02489a 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -8,7 +8,7 @@ PORTNAME= opendx PORTVERSION= 4.4.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics math MASTER_SITES= http://opendx.npaci.edu/source/ DISTNAME= dx-${PORTVERSION} @@ -64,32 +64,25 @@ CONFIGURE_ARGS+= --without-javadx PLIST_SUB+= JAVA="@comment " .endif -.include <bsd.port.pre.mk> - -.if ${ARCH} == "amd64" || ${ARCH} == "sparc64" -BROKEN= Does not compile -.endif +PLIST_SUB+= UNAMEP=${ARCH} -.if ${OSVERSION} >= 502126 -PLIST_SUB+= UNAMEP=${ARCH} ARCHDIR="" -.else -PLIST_SUB+= UNAMEP=${OPSYS:L} ARCHDIR="@comment " -.endif +.include <bsd.port.pre.mk> -pre-configure: +post-patch: @${RM} -f ${WRKSRC}/include/stamp-h.in .for dir in doc help html man @${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \ ${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g" .endfor - ${REINPLACE_CMD} -e "s;-lpthread;${PTHREAD_LIBS};g" \ + @${REINPLACE_CMD} -e "s;-lpthread;${PTHREAD_LIBS};g" \ -e "s;/usr/X11R6;${LOCALBASE};g" \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s|startserver.bat||" \ + ${WRKSRC}/src/uipp/java/server/Makefile.in post-install: @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} .if !defined(WITHOUT_JAVA) - @${RM} ${PREFIX}/dx/java/server/bin/startserver.bat ${CHMOD} 0775 ${PREFIX}/dx/java/server/nets ${TOUCH} ${DIR2PRUNE:S|^|${PREFIX}/|:S|$|/.keepme|} @${ECHO} "---------------------------------------------------------" \ diff --git a/graphics/opendx/pkg-plist b/graphics/opendx/pkg-plist index 5a5a489a52b1..d8005d8b4cd4 100644 --- a/graphics/opendx/pkg-plist +++ b/graphics/opendx/pkg-plist @@ -2327,7 +2327,7 @@ dx/ui/viewer.net @dirrm dx/man/manl @dirrm dx/man/catl @dirrm dx/man -%%ARCHDIR%%@dirrm dx/lib_%%UNAMEP%% +@dirrm dx/lib_%%UNAMEP%% @dirrm dx/lib_%%ARCH%% @dirrm dx/lib %%JAVA%%@dirrm dx/java/user |