diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2008-03-23 23:00:25 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2008-03-23 23:00:25 +0000 |
| commit | 7dad8e86731f6a02bb83a5de682e3bfbcc7232ba (patch) | |
| tree | 80ff386db716eb00c823b4dc4b205f27b55d8cf9 /graphics/freeglut | |
| parent | 728216b4c4e1013c5311296ef277a7c7f39cb632 (diff) | |
| download | ports-7dad8e86731f6a02bb83a5de682e3bfbcc7232ba.tar.gz ports-7dad8e86731f6a02bb83a5de682e3bfbcc7232ba.zip | |
- Since X11BASE = LOCALBASE, register a conflict between freeglut and
libglut;
- s/USE_XLIB/USE_XORG/
Notes
Notes:
svn path=/head/; revision=209643
Diffstat (limited to 'graphics/freeglut')
| -rw-r--r-- | graphics/freeglut/Makefile | 21 | ||||
| -rw-r--r-- | graphics/freeglut/pkg-message (renamed from graphics/freeglut/files/pkg-message.in) | 4 |
2 files changed, 9 insertions, 16 deletions
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index 82be5f9918ce..3496298a52e1 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -7,7 +7,7 @@ PORTNAME= freeglut PORTVERSION= 2.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,11 +15,13 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library -USE_AUTOTOOLS= libtool:15 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -USE_XLIB= yes -USE_GL= glu +CONFLICTS= libglut-[0-9]* + +USE_AUTOTOOLS= libtool:15 +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +USE_XORG= ice +USE_GL= glu CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ --x-libraries=${X11BASE}/lib \ @@ -28,9 +30,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-lusbhid" REINPLACE_ARGS= -i "" -PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message - DOCS= download.html freeglut.html freeglut_logo.png \ freeglut_user_interface.html index.html ogl_sm.png \ progress.html structure.html @@ -63,9 +62,7 @@ post-install: @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." .endif @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} | \ - ${SED} -e "s|/usr/local|${PREFIX}|" \ - -e "s|/usr/X11R6|${X11BASE}|" + @${CAT} ${PKGMESSAGE} @${ECHO_MSG} .include <bsd.port.mk> diff --git a/graphics/freeglut/files/pkg-message.in b/graphics/freeglut/pkg-message index d4009cb79482..7bb99a569d93 100644 --- a/graphics/freeglut/files/pkg-message.in +++ b/graphics/freeglut/pkg-message @@ -3,8 +3,4 @@ freeglut requires a DRI / OpenGL enabled-graphic card; You may try to run the sample programs to check your installation. Notice: freeglut is now a GLUT replacement. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= - -It has been installed into %%PREFIX%%/lib/ -and the original GLUT is installed under %%X11BASE%%/lib/ ****************************************************************** |