Allow it to build without installing libjpeg.

This commit is contained in:
espie 2005-04-17 13:46:20 +00:00
parent 738ce04388
commit 7b935cd947
2 changed files with 11 additions and 9 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2004/11/21 12:50:33 espie Exp $
# $OpenBSD: Makefile,v 1.5 2005/04/17 13:46:20 espie Exp $
COMMENT= "display the phase of the Sun on a map of the Earth"
COMMENT-maps= "additional maps of the Earth for sunclock"
VERSION= 3.50pre1
DISTNAME= sunclock-${VERSION}
PKGNAME= ${DISTNAME}p0
PKGNAME-maps= sunclock-maps-${VERSION}
CATEGORIES= astro
@ -18,6 +19,7 @@ SUPDISTFILES= sunclock_jpeg_medium_maps-1.0.tgz \
sunclock_huge_earthmap.jpg
EXTRACT_SUFX= .tgz
FAKE= lib
USE_X11= Yes
CONFIGURE_STYLE= imake
NO_REGRESS= Yes

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Imakefile,v 1.1.1.1 2002/08/18 14:50:00 naddy Exp $
$OpenBSD: patch-Imakefile,v 1.2 2005/04/17 13:46:20 espie Exp $
--- Imakefile.orig Tue Aug 14 15:30:24 2001
+++ Imakefile Wed Jan 23 14:05:04 2002
+++ Imakefile Sun Apr 17 15:44:08 2005
@@ -1,5 +1,5 @@
XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
@ -26,14 +26,14 @@ $OpenBSD: patch-Imakefile,v 1.1.1.1 2002/08/18 14:50:00 naddy Exp $
-#JLIBDIR=-L/usr/lib
-#ZLIBDIR=-L/usr/lib
-#JINC=-I/usr/include
+XPMLIBDIR=-L{X11BASE}/lib
+XPMINC=-I{X11BASE}/include/X11
+JLIBDIR=-L{LOCALBASE}/lib
+ZLIBDIR=-L{LOCALBASE}/lib
+JINC=-I{LOCALBASE}/include
+XPMLIBDIR=-L${X11BASE}/lib
+XPMINC=-I${X11BASE}/include/X11
+JLIBDIR=-L${DEPBASE}/lib
+ZLIBDIR=
+JINC=-I${DEPBASE}/include
-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+CCOPTIONS+= -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+CCOPTIONS+= $(JINC) $(XPMINC) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
#endif
SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \