Missing @conflict marker.

avsm · May 14, 2011 · 5092b2e · 5092b2e
1 parent 5bd3c07
commit 5092b2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/www/gtkhtml4/Makefile b/www/gtkhtml4/Makefile
@@ -1,12 +1,16 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2011/05/14 10:10:20 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2011/05/14 10:20:23 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		lightweight HTML rendering/printing/editing engine
 
 GNOME_PROJECT=		gtkhtml
 GNOME_VERSION=		4.0.1
+
 API_VERSION=		4.0
+SUBST_VARS=		API_VERSION
+
+REVISION=		0
 
 PKGNAME=		gtkhtml4-${VERSION}
 
@@ -51,6 +55,4 @@ CONFIGURE_ARGS+=        ${CONFIGURE_SHARED}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
-SUBST_VARS=		API_VERSION
-
 .include <bsd.port.mk>
diff --git a/www/gtkhtml4/pkg/PLIST b/www/gtkhtml4/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/05/14 10:10:20 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2011/05/14 10:20:23 ajacoutot Exp $
+@conflict gtkhtml3-<3.32.2p0
 @bin bin/gtkhtml-editor-test
 include/libgtkhtml-${API_VERSION}/
 include/libgtkhtml-${API_VERSION}/editor/