aboutsummaryrefslogtreecommitdiff
path: root/x11-clocks
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2004-02-10 16:10:36 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2004-02-10 16:10:36 +0000
commit942be046bfedbf3708efd38d20528109d4a1bb95 (patch)
tree94bb6d88a4c4ee271ab3562f07e0f4b4384ed0f4 /x11-clocks
parentd06b411e22473102cc69226725e835efe2c7406f (diff)
downloadports-942be046bfedbf3708efd38d20528109d4a1bb95.tar.gz
ports-942be046bfedbf3708efd38d20528109d4a1bb95.zip
Notes
Diffstat (limited to 'x11-clocks')
-rw-r--r--x11-clocks/glclock/Makefile35
-rw-r--r--x11-clocks/glclock/files/patch-aa38
2 files changed, 24 insertions, 49 deletions
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index 36000d2b8eb3..019614ba8c52 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -16,11 +16,19 @@ MASTER_SITES= http://www.daionet.gr.jp/~masa/archives/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= OpenGL Spinning pocketwatch demo and benchmark utility
+LIB_DEPENDS= glut.3:${PORTSDIR}/graphics/libglut
+
USE_X_PREFIX= yes
-USE_MESA= yes
+USE_GL= yes
MAKEFILE= makefile
-ALL_TARGET= glclock
-MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ARGS= CC="${CXX}" LN="${CXX}" OPT="${OPT}" \
+ INCLUDE_PATH="-I${X11BASE}/include" \
+ LIB_PATH="-L${X11BASE}/lib" LIBS="${LIBS}"
+ALL_TARGET= ${PORTNAME}
+
+OPT= ${CXXFLAGS} ${PTHREAD_CFLAGS} \
+ -DGLCLOCK_DIR="\\\"${PREFIX}/lib/X11/glclock/\\\""
+LIBS= -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi ${PTHREAD_LIBS}
SCRIPTS = benchclock crystalclock f_crystalclock f_glclock \
f_marbleclock f_metalclock f_mwclock f_woodclock marbleclock \
@@ -28,14 +36,19 @@ SCRIPTS = benchclock crystalclock f_crystalclock f_glclock \
TEXTURES = marble.ppm sky.ppm wood.ppm
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CXXFLAGS+= -O3 -fexpensive-optimizations -ffast-math \
+ -fomit-frame-pointer -fforce-mem -fforce-addr
+.endif
+
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/glclock ${PREFIX}/bin
- @for f in ${SCRIPTS}; do \
- ${INSTALL_SCRIPT} ${WRKSRC}/$$f ${PREFIX}/bin; \
- done
- @mkdir -p ${PREFIX}/lib/X11/glclock
- @for f in ${TEXTURES}; do \
- ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/lib/X11/glclock; \
- done
+ ${INSTALL_PROGRAM} ${WRKSRC}/glclock ${PREFIX}/bin
+.for f in ${SCRIPTS}
+ ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
+.endfor
+ @${MKDIR} ${PREFIX}/lib/X11/glclock
+.for f in ${TEXTURES}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/X11/glclock
+.endfor
.include <bsd.port.mk>
diff --git a/x11-clocks/glclock/files/patch-aa b/x11-clocks/glclock/files/patch-aa
deleted file mode 100644
index 5add68e10d01..000000000000
--- a/x11-clocks/glclock/files/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
---- makefile.orig Sat Jun 12 08:37:05 1999
-+++ makefile Tue Dec 14 15:34:07 1999
-@@ -3,22 +3,27 @@
- # June 1998 by Masaki Kawase (g93088@isc.chubu.ac.jp)
- #
-
-- CC = g++
-- LN = g++
-- OPT = -O2
-+ CC = ${CXX}
-+ LN = ${CC}
-+ OPT = ${CFLAGS} -fexpensive-optimizations -ffast-math \
-+ -fomit-frame-pointer -fforce-mem -fforce-addr
-
-- INCLUDE_PATH = -I/usr/local/X11R6/include
-- LIB_PATH = -L/usr/local/X11R6/lib
-+ GLCLOCK_DIR = ${PREFIX}/lib/X11/glclock/
-
-- LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm
-+ INCLUDE_PATH = -I${X11BASE}/include
-+ LIB_PATH = -L${X11BASE}/lib -Wl,-rpath,/usr/X11R6/lib
-+
-+# Link with -lGL on FreeBSD so we use hardware-accelerated GL, when installed.
-+# (see http://people.FreeBSD.org/~3d)
-+ LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi ${PTHREAD_LIBS}
-
- # for Mesa
- # LIBS = -lglut -lMesatk -lMesaGLU -lMesaGL -lXi -lXext -lXmu -lX11 -lm
-
-- CFLAGS = -c
-+ CFLAGS += -w -DGLCLOCK_DIR=\"${GLCLOCK_DIR}\" ${PTHREAD_CFLAGS}
- LFLAGS =
-
--COMPILE = $(CC) $(CFLAGS) $(OPT) $(INCLUDE_PATH)
-+COMPILE = $(CC) $(CFLAGS) $(OPT) -c $(INCLUDE_PATH)
- LINK = $(LN) $(LFLAGS) $(OPT) $(LIB_PATH)
-
- MAIN = glclock