diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2005-04-25 07:45:02 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2005-04-25 07:45:02 +0000 |
| commit | d05c0d77ec3afac22e0d2a96bb801803f4e4693e (patch) | |
| tree | c34ca63f6d05c96bcab9e06414e47870f8b8f633 /sysutils/glload | |
| parent | ed2059d3449d746bdee6e383229033ed1e29c518 (diff) | |
| download | ports-d05c0d77ec3afac22e0d2a96bb801803f4e4693e.tar.gz ports-d05c0d77ec3afac22e0d2a96bb801803f4e4693e.zip | |
Notes
Diffstat (limited to 'sysutils/glload')
| -rw-r--r-- | sysutils/glload/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/glload/files/patch-Makefile.FreeBSD | 21 |
2 files changed, 4 insertions, 23 deletions
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile index e2fb1bcdec17..378b71a0e221 100644 --- a/sysutils/glload/Makefile +++ b/sysutils/glload/Makefile @@ -20,8 +20,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes USE_GL= yes MAKEFILE= Makefile.FreeBSD -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ARGS= CC="${CC}" \ + CFLAGS="${CFLAGS} -I${X11BASE}/include -DFreeBSD ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}" \ + OBJS="get_load.o trackball.o glload.o texture.o screenShot.o" ALL_TARGET= glload PLIST_FILES= bin/glload diff --git a/sysutils/glload/files/patch-Makefile.FreeBSD b/sysutils/glload/files/patch-Makefile.FreeBSD deleted file mode 100644 index 743d347c144b..000000000000 --- a/sysutils/glload/files/patch-Makefile.FreeBSD +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- Makefile.FreeBSD.orig Wed Mar 8 22:02:58 2000 -+++ Makefile.FreeBSD Thu Apr 15 00:22:04 2004 -@@ -1,11 +1,11 @@ --OBJS = get_load.o trackball.o glload.o texture.oinvalid --CFLAGS += -I/usr/X11R6/include -DFreeBSD -+OBJS = get_load.o trackball.o glload.o texture.o screenShot.o -+CFLAGS += -I${X11BASE}/include -DFreeBSD ${PTHREAD_CFLAGS} - # i need this --LDFLAGS = -L/usr/X11R6/lib -+LDFLAGS = -L${X11BASE}/lib ${PTHREAD_LIBS} - # the libs librpcsvc me only be needed on IRIX - LLDLIBS = -lglut -lGLU -lGL -lXmu -lXext -lXi -lXt -lICE -lSM -lX11 -lm - # your C-compiler --CC = gcc -+CC ?= gcc - - glload: $(OBJS) - $(CC) -o glload $(OBJS) $(LDFLAGS) $(LLDLIBS) |