wmitime: update to 0.5; fix the build with -fno-common
tweaks and OK sthen@
This commit is contained in:
cwen
parent
fe1f017a8d
commit
959be099d2
@ -1,26 +1,31 @@
|
||||
# $OpenBSD: Makefile,v 1.19 2019/07/12 20:51:24 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.20 2021/02/04 13:48:53 cwen Exp $
|
||||
|
||||
COMMENT= wm-dockapp; shows the date, time, and Internet time
|
||||
|
||||
DISTNAME= wmitime-0.3
|
||||
REVISION= 2
|
||||
DISTNAME= wmitime-0.5
|
||||
CATEGORIES= x11 x11/windowmaker
|
||||
|
||||
HOMEPAGE= https://www.dockapps.net/wmitime
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE= Yes
|
||||
WANTLIB= X11 Xext Xpm c m
|
||||
|
||||
MASTER_SITES= http://dockapps.org/files/22/29/ \
|
||||
http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
|
||||
WANTLIB += X11 Xext Xpm c dockapp iconv m
|
||||
|
||||
MAKE_FLAGS= CC="${CC}"
|
||||
MASTER_SITES= https://www.dockapps.net/download/
|
||||
|
||||
RUN_DEPENDS= devel/desktop-file-utils
|
||||
LIB_DEPENDS= converters/libiconv \
|
||||
devel/libdockapp>=0.7.3
|
||||
|
||||
MAKE_FLAGS= CC="${CC}" PREFIX="${PREFIX}" MANDIR="${PREFIX}/man/man1" \
|
||||
CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
|
||||
|
||||
NO_TEST= Yes
|
||||
|
||||
WRKDIST= ${WRKDIR}/wmitime
|
||||
WRKSRC= ${WRKDIST}/wmitime
|
||||
CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/wmitime ${PREFIX}/bin
|
||||
WRKDIST= ${WRKDIR}/dockapps-26db447
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (wmitime-0.3.tar.gz) = /OxEG6wYOsL7u/nVd8Lqr5ueApKmBBJW5aQoanbN3GE=
|
||||
SIZE (wmitime-0.3.tar.gz) = 21442
|
||||
SHA256 (wmitime-0.5.tar.gz) = oYPiCNi6v5fopA4356WoseE3HKVH14lvMU+AhRb0Xm0=
|
||||
SIZE (wmitime-0.5.tar.gz) = 15099
|
||||
|
||||
@ -1,26 +1,20 @@
|
||||
$OpenBSD: patch-Makefile,v 1.2 2001/03/09 14:29:58 wilfried Exp $
|
||||
--- wmitime/Makefile.orig Mon Mar 29 05:51:39 1999
|
||||
+++ wmitime/Makefile Thu Mar 8 13:17:14 2001
|
||||
@@ -1,7 +1,6 @@
|
||||
#LANG = fr
|
||||
-LIBDIR = -L/usr/X11R6/lib
|
||||
+LIBDIR = -L${X11BASE}/lib
|
||||
LIBS = -lXpm -lXext -lX11 -lm
|
||||
-FLAGS = -O2
|
||||
OBJS = wmitime.o \
|
||||
../wmgeneral/wmgeneral.o \
|
||||
../wmgeneral/misc.o \
|
||||
@@ -9,12 +8,12 @@ OBJS = wmitime.o \
|
||||
$OpenBSD: patch-Makefile,v 1.3 2021/02/04 13:48:53 cwen Exp $
|
||||
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -1,4 +1,4 @@
|
||||
-LIBS = -lXpm -lXext -lX11 -lm -ldockapp
|
||||
+LIBS = -lXpm -lXext -lX11 -lm -ldockapp -liconv
|
||||
CFLAGS = -O2 -Wall
|
||||
OBJS = wmitime.o
|
||||
INSTALL = install
|
||||
@@ -11,9 +11,9 @@ DESKTOPDIR = $(PREFIX)/share/applications
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
|
||||
|
||||
|
||||
.c.o:
|
||||
- cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o
|
||||
+ ${CC} -I${X11BASE}/include ${CFLAGS} -c $< -o $@
|
||||
|
||||
-wmtime: $(OBJS)
|
||||
- cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS)
|
||||
+wmitime: $(OBJS)
|
||||
+ ${CC} ${CFLAGS} -o $@ $(OBJS) $(LIBDIR) $(LIBS)
|
||||
wmitime: $(OBJS)
|
||||
- $(CC) $(LDFLAGS) -o wmitime $^ $(LIBS)
|
||||
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
|
||||
|
||||
-all:: wmtime
|
||||
+all:: wmitime
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-wmgeneral_list_h,v 1.1 2017/05/03 19:18:27 jca Exp $
|
||||
--- wmgeneral/list.h.orig
|
||||
+++ wmgeneral/list.h
|
||||
@@ -29,9 +29,7 @@ Boston, MA 02111-1307, USA. */
|
||||
#ifndef __LIST_H_
|
||||
#define __LIST_H_
|
||||
|
||||
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
||||
-# define INLINE inline
|
||||
-#else
|
||||
+#if 1
|
||||
# define INLINE
|
||||
#endif
|
||||
|
||||
@ -1,18 +1,20 @@
|
||||
$OpenBSD: patch-wmitime_c,v 1.2 2001/03/09 14:29:58 wilfried Exp $
|
||||
--- wmitime/wmitime.c.orig Mon Mar 29 05:56:05 1999
|
||||
+++ wmitime/wmitime.c Thu Mar 8 13:14:35 2001
|
||||
@@ -281,7 +281,7 @@ void DrawInetTime(void)
|
||||
$OpenBSD: patch-wmitime_c,v 1.3 2021/02/04 13:48:53 cwen Exp $
|
||||
|
||||
Index: wmitime.c
|
||||
--- wmitime.c.orig
|
||||
+++ wmitime.c
|
||||
@@ -248,7 +248,7 @@ void DrawInetTime(void)
|
||||
|
||||
// Compute Inet Time
|
||||
/* Compute Inet Time */
|
||||
iTime=(clk->tm_hour*3600+clk->tm_min*60+clk->tm_sec);
|
||||
- iTime=iTime+((timezone-1)+3600);
|
||||
+ iTime=iTime+((1-clk->tm_gmtoff)+3600);
|
||||
if (clk->tm_isdst)
|
||||
iTime-=3600;
|
||||
iTime=(iTime*1000)/86400;
|
||||
@@ -398,7 +398,7 @@ void DrawInetWheel(void)
|
||||
@@ -374,7 +374,7 @@ void DrawInetWheel(void)
|
||||
|
||||
// Calculate Wheel Position...
|
||||
/* Calculate Wheel Position... */
|
||||
iTime=(clk->tm_hour*3600+clk->tm_min*60+clk->tm_sec);
|
||||
- iTime=iTime+((timezone-1)+3600);
|
||||
+ iTime=iTime+((1-clk->tm_gmtoff)+3600);
|
||||
|
||||
@ -1,2 +1,5 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2018/05/25 13:01:41 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2021/02/04 13:48:53 cwen Exp $
|
||||
@bin bin/wmitime
|
||||
@man man/man1/wmitime.1
|
||||
share/applications/wmitime.desktop
|
||||
@tag update-desktop-database
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user