summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-11-15 07:58:50 +0000
committerjlam <jlam@pkgsrc.org>2001-11-15 07:58:50 +0000
commitdf45083180d4f06ecfefd12813b6af3502cbff27 (patch)
tree5d590a8a920f05feb2d5b8a23bc137857b24b74c /time
parent1706cb5016a2cf050d664287911ea2b3061badae (diff)
downloadpkgsrc-df45083180d4f06ecfefd12813b6af3502cbff27.tar.gz
Strongly buildlinkify, and make this package work on Solaris by following
the suggestions in the Makefile.
Diffstat (limited to 'time')
-rw-r--r--time/wmcalclock/Makefile18
-rw-r--r--time/wmcalclock/distinfo4
-rw-r--r--time/wmcalclock/patches/patch-aa22
3 files changed, 28 insertions, 16 deletions
diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile
index 3dbcebdebe6..6969f7e100c 100644
--- a/time/wmcalclock/Makefile
+++ b/time/wmcalclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:32:11 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/15 07:58:50 jlam Exp $
#
DISTNAME= wmCalClock-1.25
@@ -9,14 +9,22 @@ MAINTAINER= wiz@netbsd.org
HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
COMMENT= another WindowMaker calendar/clock dockapp
-USE_X11BASE= YES
-USE_XPM= YES
-USE_GMAKE= YES
+USE_BUILDLINK_ONLY= YES
+USE_X11BASE= YES
+USE_GMAKE= YES
-WRKSRC= ${WRKDIR}/${DISTNAME}/Src
+WRKSRC= ${WRKDIR}/${DISTNAME}/Src
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+= EXTRALIBS="-lsocket -lnsl"
+.endif
do-install:
${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/man/man1/
${INSTALL_PROGRAM} ${WRKSRC}/wmCalClock ${PREFIX}/bin/
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/wmcalclock/distinfo b/time/wmcalclock/distinfo
index 463786ce3f9..4e355c552ee 100644
--- a/time/wmcalclock/distinfo
+++ b/time/wmcalclock/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:47:16 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/11/15 07:58:50 jlam Exp $
SHA1 (wmCalClock-1.25.tar.gz) = 029bdda7ec7e93ed4b29b67936b40729e7f1dcdc
Size (wmCalClock-1.25.tar.gz) = 71574 bytes
-SHA1 (patch-aa) = bfdadc22854d18ed729ea85bf746618de2b371aa
+SHA1 (patch-aa) = 3ade88a3f671615fedbf4e1f41473e8e19c48ec2
diff --git a/time/wmcalclock/patches/patch-aa b/time/wmcalclock/patches/patch-aa
index 08d0c0936b3..039c63132e3 100644
--- a/time/wmcalclock/patches/patch-aa
+++ b/time/wmcalclock/patches/patch-aa
@@ -1,17 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:21 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/11/15 07:58:51 jlam Exp $
---- Makefile.orig Sat Mar 27 07:46:38 1999
-+++ Makefile Sun Dec 12 19:13:34 1999
-@@ -1,8 +1,8 @@
+--- Makefile.orig Sat Mar 27 01:46:38 1999
++++ Makefile
+@@ -1,11 +1,11 @@
-CC = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-+# CC = gcc
-+CFLAGS += -O2 -Wall
-+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include
++#CC = gcc
++#CFLAGS = -O2 -Wall
++INCDIR = ${CFLAGS}
DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
++LIBDIR = ${LDFLAGS}
# for Linux
- LIBS = -lXpm -lX11 -lXext
+-LIBS = -lXpm -lX11 -lXext
++LIBS = -lXpm -lX11 -lXext ${EXTRALIBS}
+
+ # for Solaris
+ # LIBS = -lXpm -lX11 -lXext -lsocket -lnsl