sync WANTLIB and add a patch to handle e2fsprogs/libuuid being installed under
it's normal name. ok aja
This commit is contained in:
parent
2ee2f7ecbc
commit
d4fa91e632
@ -1,8 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2013/04/25 16:33:00 sebastia Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2013/06/21 22:39:28 sthen Exp $
|
||||
|
||||
COMMENT= calendaring application based on GNUstep
|
||||
|
||||
VERSION = 0.43
|
||||
VERSION= 0.43
|
||||
REVISION= 0
|
||||
DISTNAME= SimpleAgenda-${VERSION}
|
||||
CATEGORIES+= productivity
|
||||
|
||||
@ -11,10 +12,10 @@ HOMEPAGE= http://coyote.octets.fr/simpleagenda/
|
||||
|
||||
MODULES= x11/gnustep
|
||||
|
||||
WANTLIB += c m pthread e2fs-uuid ical Addresses DBusKit
|
||||
WANTLIB += c m pthread uuid ical Addresses DBusKit
|
||||
LIB_DEPENDS = x11/gnustep/addresses \
|
||||
x11/gnustep/dbuskit \
|
||||
sysutils/e2fsprogs \
|
||||
sysutils/e2fsprogs>=1.42.7 \
|
||||
textproc/libical
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
|
15
x11/gnustep/simpleagenda/patches/patch-GNUmakefile_preamble
Normal file
15
x11/gnustep/simpleagenda/patches/patch-GNUmakefile_preamble
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-GNUmakefile_preamble,v 1.5 2013/06/21 22:39:28 sthen Exp $
|
||||
--- GNUmakefile.preamble.orig Fri Jun 21 05:19:31 2013
|
||||
+++ GNUmakefile.preamble Fri Jun 21 05:19:36 2013
|
||||
@@ -14,11 +14,7 @@ ADDITIONAL_CFLAGS +=
|
||||
# Additional flags to pass to the linker
|
||||
ADDITIONAL_TOOL_LIBS += -lical
|
||||
ifeq ($(LIBUUID),yes)
|
||||
-ifeq ($(findstring openbsd, $(GNUSTEP_TARGET_OS)), openbsd)
|
||||
-ADDITIONAL_TOOL_LIBS += -le2fs-uuid
|
||||
-else
|
||||
ADDITIONAL_TOOL_LIBS += -luuid
|
||||
-endif
|
||||
endif
|
||||
ifeq ($(ADDRESSES),yes)
|
||||
ADDITIONAL_TOOL_LIBS += -lAddresses
|
15
x11/gnustep/simpleagenda/patches/patch-tests_GNUmakefile
Normal file
15
x11/gnustep/simpleagenda/patches/patch-tests_GNUmakefile
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-tests_GNUmakefile,v 1.5 2013/06/21 22:39:28 sthen Exp $
|
||||
--- tests/GNUmakefile.orig Fri Jun 21 05:19:09 2013
|
||||
+++ tests/GNUmakefile Fri Jun 21 05:19:26 2013
|
||||
@@ -23,11 +23,7 @@ SimpleAgendaTests_OBJC_FILES = \
|
||||
|
||||
SimpleAgendaTests_TOOL_LIBS = -lObjcUnit -lical -lgnustep-gui
|
||||
#ifeq(have_libuuid,yes)
|
||||
-ifeq ($(findstring openbsd, $(GNUSTEP_TARGET_OS)), openbsd)
|
||||
-SimpleAgendaTests_TOOL_LIBS += -le2fs-uuid
|
||||
-else
|
||||
SimpleAgendaTests_TOOL_LIBS += -luuid
|
||||
-endif
|
||||
#endif
|
||||
|
||||
ADDITIONAL_OBJCFLAGS = -Wno-import -Wall
|
Loading…
x
Reference in New Issue
Block a user