solve conflict
This commit is contained in:
parent
22ddeb3e43
commit
66fbde8082
@ -1,20 +1,14 @@
|
||||
# OpenBSD makefile for: xdaliclock
|
||||
# Version required 2.11
|
||||
# Date created: 21 December, 1997
|
||||
# Whom: Don Schmidt
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.11 2001/07/09 17:11:38 pvalchev Exp $
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.12 2001/07/10 21:38:46 lebel Exp $
|
||||
|
||||
COMMENT= "rather neat animated clock"
|
||||
|
||||
DISTNAME= xdaliclock-2.11
|
||||
DISTNAME= xdaliclock-2.18
|
||||
CATEGORIES= x11
|
||||
NEED_VERSION= 1.402
|
||||
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
|
||||
MASTER_SITE_SUBDIR= applications
|
||||
MASTER_SITES= http://www.jwz.org/xdaliclock/
|
||||
|
||||
MAINTAINER= ports@OpenBSD.ORG
|
||||
HOMEPAGE= http://www.jwz.org/xdaliclock/
|
||||
|
||||
# License: BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -22,7 +16,9 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
USE_X11= Yes
|
||||
CONFIGURE_STYLE= imake
|
||||
USE_X11= Yes
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
WRKSRC= ${WRKDIST}/X11
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
Loading…
x
Reference in New Issue
Block a user