Install files where they belong too (i.e. don't move out from default).

This commit is contained in:
ajacoutot 2011-05-14 11:22:12 +00:00
parent 5cd35159ef
commit fb8aa835b1
4 changed files with 78 additions and 106 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2011/05/13 22:18:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.36 2011/05/14 11:22:12 ajacoutot Exp $
COMMENT= GObject Introspection
@ -6,7 +6,7 @@ GNOME_VERSION= 0.10.8
GNOME_PROJECT= gobject-introspection
CATEGORIES= devel
REVISION= 1
REVISION= 2
SHARED_LIBS += girepository-1.0 1.0 # 1.0
@ -57,8 +57,7 @@ MODPY_ADJ_FILES= giscanner/scannermain.py \
pre-configure:
${SUBST_CMD} ${WRKSRC}/giscanner/dumper.py \
${WRKSRC}/giscanner/scannermain.py \
${WRKSRC}/tools/g-ir-scanner.in
${WRKSRC}/giscanner/scannermain.py
perl -pi -e "s,'cc','${CC}'," ${WRKSRC}/giscanner/sourcescanner.py
.include <bsd.port.mk>

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.11 2011/04/25 11:43:17 jasper Exp $
--- Makefile.in.orig Thu Apr 21 15:37:01 2011
+++ Makefile.in Thu Apr 21 16:01:49 2011
@@ -537,7 +537,7 @@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
# Python module
-pkgpyexecdir = $(pkglibdir)/giscanner
+pkgpyexecdir = @pkgpythondir@/giscanner
pkgpythondir = @pkgpythondir@
prefix = @prefix@
program_transform_name = @program_transform_name@

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-tools_g-ir-scanner_in,v 1.3 2010/12/23 14:34:49 jasper Exp $
Pickup files from the correct directory.
--- tools/g-ir-scanner.in.orig Fri Nov 12 04:40:03 2010
+++ tools/g-ir-scanner.in Thu Dec 23 15:21:17 2010
@@ -35,7 +35,7 @@ if srcdir is not None:
else:
# This is a private directory, we don't want to pollute the global
# namespace.
- path = os.path.join('@libdir@', 'gobject-introspection')
+ path = os.path.join('${MODPY_SITEPKG}', 'gobject-introspection')
sys.path.insert(0, path)
from giscanner.scannermain import scanner_main

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2011/05/13 22:18:34 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.8 2011/05/14 11:22:12 ajacoutot Exp $
bin/g-ir-annotation-tool
@bin bin/g-ir-compiler
@bin bin/g-ir-generate
@ -42,85 +42,85 @@ lib/girepository-1.0/xfixes-4.0.typelib
lib/girepository-1.0/xft-2.0.typelib
lib/girepository-1.0/xlib-2.0.typelib
lib/girepository-1.0/xrandr-1.3.typelib
lib/gobject-introspection/
lib/gobject-introspection/giscanner/
lib/gobject-introspection/giscanner/__init__.py
lib/gobject-introspection/giscanner/__init__.pyc
lib/gobject-introspection/giscanner/__init__.pyo
@comment lib/gobject-introspection/giscanner/_giscanner.a
@comment lib/gobject-introspection/giscanner/_giscanner.la
lib/gobject-introspection/giscanner/_giscanner.so
lib/gobject-introspection/giscanner/annotationmain.py
lib/gobject-introspection/giscanner/annotationmain.pyc
lib/gobject-introspection/giscanner/annotationmain.pyo
lib/gobject-introspection/giscanner/annotationparser.py
lib/gobject-introspection/giscanner/annotationparser.pyc
lib/gobject-introspection/giscanner/annotationparser.pyo
lib/gobject-introspection/giscanner/ast.py
lib/gobject-introspection/giscanner/ast.pyc
lib/gobject-introspection/giscanner/ast.pyo
lib/gobject-introspection/giscanner/cachestore.py
lib/gobject-introspection/giscanner/cachestore.pyc
lib/gobject-introspection/giscanner/cachestore.pyo
lib/gobject-introspection/giscanner/codegen.py
lib/gobject-introspection/giscanner/codegen.pyc
lib/gobject-introspection/giscanner/codegen.pyo
lib/gobject-introspection/giscanner/config.py
lib/gobject-introspection/giscanner/config.pyc
lib/gobject-introspection/giscanner/config.pyo
lib/gobject-introspection/giscanner/dumper.py
lib/gobject-introspection/giscanner/dumper.pyc
lib/gobject-introspection/giscanner/dumper.pyo
lib/gobject-introspection/giscanner/gdumpparser.py
lib/gobject-introspection/giscanner/gdumpparser.pyc
lib/gobject-introspection/giscanner/gdumpparser.pyo
lib/gobject-introspection/giscanner/girparser.py
lib/gobject-introspection/giscanner/girparser.pyc
lib/gobject-introspection/giscanner/girparser.pyo
lib/gobject-introspection/giscanner/girwriter.py
lib/gobject-introspection/giscanner/girwriter.pyc
lib/gobject-introspection/giscanner/girwriter.pyo
lib/gobject-introspection/giscanner/introspectablepass.py
lib/gobject-introspection/giscanner/introspectablepass.pyc
lib/gobject-introspection/giscanner/introspectablepass.pyo
lib/gobject-introspection/giscanner/libtoolimporter.py
lib/gobject-introspection/giscanner/libtoolimporter.pyc
lib/gobject-introspection/giscanner/libtoolimporter.pyo
lib/gobject-introspection/giscanner/maintransformer.py
lib/gobject-introspection/giscanner/maintransformer.pyc
lib/gobject-introspection/giscanner/maintransformer.pyo
lib/gobject-introspection/giscanner/message.py
lib/gobject-introspection/giscanner/message.pyc
lib/gobject-introspection/giscanner/message.pyo
lib/gobject-introspection/giscanner/odict.py
lib/gobject-introspection/giscanner/odict.pyc
lib/gobject-introspection/giscanner/odict.pyo
lib/gobject-introspection/giscanner/scannermain.py
lib/gobject-introspection/giscanner/scannermain.pyc
lib/gobject-introspection/giscanner/scannermain.pyo
lib/gobject-introspection/giscanner/shlibs.py
lib/gobject-introspection/giscanner/shlibs.pyc
lib/gobject-introspection/giscanner/shlibs.pyo
lib/gobject-introspection/giscanner/sourcescanner.py
lib/gobject-introspection/giscanner/sourcescanner.pyc
lib/gobject-introspection/giscanner/sourcescanner.pyo
lib/gobject-introspection/giscanner/testcodegen.py
lib/gobject-introspection/giscanner/testcodegen.pyc
lib/gobject-introspection/giscanner/testcodegen.pyo
lib/gobject-introspection/giscanner/transformer.py
lib/gobject-introspection/giscanner/transformer.pyc
lib/gobject-introspection/giscanner/transformer.pyo
lib/gobject-introspection/giscanner/utils.py
lib/gobject-introspection/giscanner/utils.pyc
lib/gobject-introspection/giscanner/utils.pyo
lib/gobject-introspection/giscanner/xmlwriter.py
lib/gobject-introspection/giscanner/xmlwriter.pyc
lib/gobject-introspection/giscanner/xmlwriter.pyo
lib/libgirepository-1.0.a
lib/libgirepository-1.0.la
@lib lib/libgirepository-1.0.so.${LIBgirepository-1.0_VERSION}
lib/pkgconfig/gobject-introspection-1.0.pc
lib/pkgconfig/gobject-introspection-no-export-1.0.pc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/__init__.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/__init__.pyo
@comment lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/_giscanner.a
@comment lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/_giscanner.la
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/_giscanner.so
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/annotationmain.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/annotationmain.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/annotationmain.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/annotationparser.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/annotationparser.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/annotationparser.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/ast.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/ast.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/ast.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/cachestore.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/cachestore.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/cachestore.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/codegen.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/codegen.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/codegen.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/config.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/config.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/config.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/dumper.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/dumper.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/dumper.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/gdumpparser.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/gdumpparser.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/gdumpparser.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/girparser.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/girparser.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/girparser.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/girwriter.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/girwriter.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/girwriter.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/introspectablepass.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/introspectablepass.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/introspectablepass.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/libtoolimporter.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/libtoolimporter.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/libtoolimporter.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/maintransformer.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/maintransformer.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/maintransformer.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/message.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/message.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/message.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/odict.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/odict.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/odict.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/scannermain.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/scannermain.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/scannermain.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/shlibs.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/shlibs.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/shlibs.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/sourcescanner.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/sourcescanner.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/sourcescanner.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/testcodegen.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/testcodegen.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/testcodegen.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/transformer.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/transformer.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/transformer.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/utils.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/utils.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/utils.pyo
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/xmlwriter.py
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/xmlwriter.pyc
lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/xmlwriter.pyo
@man man/man1/g-ir-compiler.1
@man man/man1/g-ir-generate.1
@man man/man1/g-ir-scanner.1