diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2004-02-25 10:53:08 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2004-02-25 10:53:08 +0000 |
| commit | df3e838c2a8e6c55dfdc36ed8c824350c160f379 (patch) | |
| tree | 5271996ae8b0b3a78ecafd6a954c203402d9e87e | |
| parent | 1a99b8b29f68ec4b5497af094c0a9a558f5d7931 (diff) | |
| download | ports-df3e838c2a8e6c55dfdc36ed8c824350c160f379.tar.gz ports-df3e838c2a8e6c55dfdc36ed8c824350c160f379.zip | |
- add CONFLICTS
Notes
Notes:
svn path=/head/; revision=102077
| -rw-r--r-- | net-im/licq/Makefile | 3 | ||||
| -rw-r--r-- | net/licq/Makefile | 3 | ||||
| -rw-r--r-- | print/a2ps-letter/Makefile | 10 | ||||
| -rw-r--r-- | print/a2ps-letter/distinfo | 2 | ||||
| -rw-r--r-- | x11-toolkits/gnustep-back/Makefile | 3 | ||||
| -rw-r--r-- | x11-toolkits/gnustep-back/distinfo | 1 |
6 files changed, 21 insertions, 1 deletions
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index 1def0e68e878..4414cfad23dd 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -33,6 +33,9 @@ LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS+=--enable-socks5 CONFIGURE_ARGS+=--with-socks5-inc=${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFLICTS?= licq-base-1.* +.else +CONFLICTS?= licq-base-socks-1.* .endif .if !defined(WITHOUT_OPENSSL) diff --git a/net/licq/Makefile b/net/licq/Makefile index 1def0e68e878..4414cfad23dd 100644 --- a/net/licq/Makefile +++ b/net/licq/Makefile @@ -33,6 +33,9 @@ LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS+=--enable-socks5 CONFIGURE_ARGS+=--with-socks5-inc=${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFLICTS?= licq-base-1.* +.else +CONFLICTS?= licq-base-socks-1.* .endif .if !defined(WITHOUT_OPENSSL) diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile index 1cff843d8f1b..bf2bda7dbc2c 100644 --- a/print/a2ps-letter/Makefile +++ b/print/a2ps-letter/Makefile @@ -38,6 +38,16 @@ CONFIGURE_ARGS= --with-medium=${PAPERSIZECNF} --sharedstatedir=${PREFIX}/share - @${FALSE} .endif +.if ${PAPERSIZE} == a4 +CONFLICTS?= a2ps-letter-4.* a2ps-letterdj-4.* +.else +.if ${PAPERSIZE} == letter +CONFLICTS?= a2ps-a4-4.* a2ps-letterdj-4.* +.else +CONFLICTS?= a2ps-a4-4.* a2ps-letter-4.* +.endif +.endif + .if defined(WITH_EMACS) PLIST_SUB+= WITHEMACS="" .else diff --git a/print/a2ps-letter/distinfo b/print/a2ps-letter/distinfo index aa1d529a8fd0..469e38fee391 100644 --- a/print/a2ps-letter/distinfo +++ b/print/a2ps-letter/distinfo @@ -1,2 +1,2 @@ MD5 (a2ps-4.13b.tar.gz) = 0c8e0c31b08c14f7a7198ce967eb3281 -MD5 (sheets.map) = add5dfd9f357ab6e7bd610a5cddab0ee +SIZE (a2ps-4.13b.tar.gz) = 1944289 diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile index 979ed3f4e133..ad110cf33592 100644 --- a/x11-toolkits/gnustep-back/Makefile +++ b/x11-toolkits/gnustep-back/Makefile @@ -45,6 +45,7 @@ CONFIGURE_ARGS+= --enable-graphics=xdps --with-name=xdps PLIST_SUB+= BACK=xdps PLIST_SUB+= USE_XLIB="@comment " USE_XDPS="" USE_ART="@comment " PKGNAMESUFFIX?= -xdps +CONFLICTS?= gunstep-back-0.* gunstep-back-art-0.* .else .if defined(WITH_GNUSTEP_LIBART) LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2 @@ -52,10 +53,12 @@ CONFIGURE_ARGS+= --enable-graphics=art --with-name=art PLIST_SUB+= BACK=art USE_XLIB="@comment " PLIST_SUB+= USE_XLIB="@comment " USE_XDPS="@comment " USE_ART="" PKGNAMESUFFIX?= -art +CONFLICTS?= gunstep-back-0.* gunstep-back-xdps-0.* .else CONFIGURE_ARGS+= --enable-graphics=xlib --with-name=back PLIST_SUB+= BACK=back PLIST_SUB+= USE_XLIB="" USE_XDPS="@comment " USE_ART="@comment " +CONFLICTS?= gunstep-back-xdps-0.* gunstep-back-art-0.* .endif .endif diff --git a/x11-toolkits/gnustep-back/distinfo b/x11-toolkits/gnustep-back/distinfo index 8d7c87fd018a..492df167e9ec 100644 --- a/x11-toolkits/gnustep-back/distinfo +++ b/x11-toolkits/gnustep-back/distinfo @@ -1 +1,2 @@ MD5 (gnustep-back-0.9.1.tar.gz) = 9279075240738140e11c8f15bb9824d5 +SIZE (gnustep-back-0.9.1.tar.gz) = 362659 |