5 files changed, 30 insertions, 18 deletions

diff --git a/x11-toolkits/inti-gconf/Makefile b/x11-toolkits/inti-gconf/Makefile
index 77865f880e64..928042b5d928 100644
--- a/x11-toolkits/inti-gconf/Makefile
+++ b/x11-toolkits/inti-gconf/Makefile
@@ -18,11 +18,8 @@ COMMENT=	An Inti binding for GConf, the GNOME Configuration System
 
 LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti
 
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
 USE_GNOME=	gconf2 gnomehack gnomeprefix
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/inti-gl/Makefile b/x11-toolkits/inti-gl/Makefile
index aa2311e1baa3..e40a34824d7d 100644
--- a/x11-toolkits/inti-gl/Makefile
+++ b/x11-toolkits/inti-gl/Makefile
@@ -19,10 +19,7 @@ COMMENT=	An Inti binding for GtkGLExt, the Open-GL extension to GTK+
 LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti \
 		gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
 
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
+USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnomehack gnomeprefix
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/inti-gl/pkg-plist b/x11-toolkits/inti-gl/pkg-plist
index 4c9ba2ecfa19..cc5f18c8658d 100644
--- a/x11-toolkits/inti-gl/pkg-plist
+++ b/x11-toolkits/inti-gl/pkg-plist
@@ -1,4 +1,25 @@
+include/inti-1.0/inti/gdk/gl/config.h
+include/inti-1.0/inti/gdk/gl/context.h
+include/inti-1.0/inti/gdk/gl/drawable.h
+include/inti-1.0/inti/gdk/gl/font.h
+include/inti-1.0/inti/gdk/gl/init.h
+include/inti-1.0/inti/gdk/gl/pixmap.h
+include/inti-1.0/inti/gdk/gl/private/config_p.h
+include/inti-1.0/inti/gdk/gl/private/context_p.h
+include/inti-1.0/inti/gdk/gl/private/drawable_p.h
+include/inti-1.0/inti/gdk/gl/private/pixmap_p.h
+include/inti-1.0/inti/gdk/gl/private/window_p.h
+include/inti-1.0/inti/gdk/gl/query.h
+include/inti-1.0/inti/gdk/gl/shapes.h
+include/inti-1.0/inti/gdk/gl/window.h
+include/inti-1.0/inti/gtk/gl/drawingarea.h
+include/inti-1.0/inti/gtk/gl/init.h
+include/inti-1.0/inti/gtk/gl/widget.h
+include/inti-1.0/inti/inti-gl.h
 lib/inti-1.0/include/inti-gl-config.h
 lib/libinti-gl-1.0.so
 lib/libinti-gl-1.0.so.0
 libdata/pkgconfig/inti-gl-1.0.pc
+@dirrm include/inti-1.0/inti/gdk/gl/private
+@dirrm include/inti-1.0/inti/gdk/gl
+@dirrm include/inti-1.0/inti/gtk/gl
diff --git a/x11-toolkits/inti-sourceview/Makefile b/x11-toolkits/inti-sourceview/Makefile
index 406970428d73..6af50539e1de 100644
--- a/x11-toolkits/inti-sourceview/Makefile
+++ b/x11-toolkits/inti-sourceview/Makefile
@@ -18,11 +18,8 @@ COMMENT=	An Inti binding for GtkSourceView
 
 LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti
 
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
 USE_GNOME=	gtksourceview gnomehack gnomeprefix
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/inti/pkg-plist b/x11-toolkits/inti/pkg-plist
index 90822b81db6d..798109ad3541 100644
--- a/x11-toolkits/inti/pkg-plist
+++ b/x11-toolkits/inti/pkg-plist
@@ -311,15 +311,15 @@ include/inti-1.0/inti/utf-string.h
 @dirrm include/inti-1.0/inti/gdk/private
 @dirrm include/inti-1.0/inti/gdk-pixbuf/private
 @dirrm include/inti-1.0/inti/gdk-pixbuf
+@dirrm include/inti-1.0/inti/gdk
 @dirrm include/inti-1.0/inti/atk/private
 @dirrm include/inti-1.0/inti/atk
-@unexec rmdir %D/include/inti-1.0/inti/gdk 2>/dev/null || true
-@unexec rmdir %D/include/inti-1.0/inti/gtk 2>/dev/null || true
-@unexec rmdir %D/include/inti-1.0/inti 2>/dev/null || true
-@unexec rmdir %D/include/inti-1.0 2>/dev/null || true
+@dirrm include/inti-1.0/inti/gtk
+@dirrm include/inti-1.0/inti
+@dirrm include/inti-1.0
 lib/inti-1.0/include/inti-config.h
-@unexec rmdir %D/lib/inti-1.0/include 2>/dev/null || true
-@unexec rmdir %D/lib/inti-1.0 2>/dev/null || true
+@dirrm lib/inti-1.0/include
+@dirrm lib/inti-1.0
 lib/libinti-1.0.so
 lib/libinti-1.0.so.9
 libdata/pkgconfig/inti-1.0.pc