diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-01-29 17:00:19 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-01-29 17:00:19 +0800 |
| commit | 4d554d38d276b38bc891c0b063381d1a8980e82d (patch) | |
| tree | ceb1f378a4790b5713678ef2340adc0b9af87161 | |
| parent | 435e44a00eb1f1c1eca75f64bd23e37b32085522 (diff) | |
| download | marcuscom-ports-4d554d38d276b38bc891c0b063381d1a8980e82d.tar marcuscom-ports-4d554d38d276b38bc891c0b063381d1a8980e82d.tar.gz marcuscom-ports-4d554d38d276b38bc891c0b063381d1a8980e82d.tar.bz2 marcuscom-ports-4d554d38d276b38bc891c0b063381d1a8980e82d.tar.lz marcuscom-ports-4d554d38d276b38bc891c0b063381d1a8980e82d.tar.xz marcuscom-ports-4d554d38d276b38bc891c0b063381d1a8980e82d.tar.zst marcuscom-ports-4d554d38d276b38bc891c0b063381d1a8980e82d.zip | |
Merge CONFLICTS change from ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3547 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | net/gaim/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/gaim/Makefile b/net/gaim/Makefile index da13eed58..78e76aaa3 100644 --- a/net/gaim/Makefile +++ b/net/gaim/Makefile @@ -17,7 +17,7 @@ COMMENT= Multi-protocol instant messaging client LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification -CONFLICTS?= ja-gaim-* +CONFLICTS?= ja-gaim-[0-9]* USE_X_PREFIX= yes USE_GMAKE= yes |