Add MODULE_ARCH to PLIST_SUB, and make portlint happy.

Submitted by:	ssedov at mbsd.msk.ru
This commit is contained in:
Vanilla I. Shu 2006-07-11 08:18:25 +00:00
parent 637d7d8275
commit bc430abbdb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=167443
6 changed files with 111 additions and 103 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= evas PORTNAME= evas
PORTVERSION= 0.9.9.029 PORTVERSION= 0.9.9.029
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= http://enlightenment.freedesktop.org/files/ MASTER_SITES= http://enlightenment.freedesktop.org/files/
@ -23,14 +23,16 @@ GNU_CONFIGURE= yes
USE_FREETYPE2= yes USE_FREETYPE2= yes
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig gnometarget USE_GNOME= gnomehack pkgconfig gnometarget
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
OPTIONS= GL "Enable GL support" off OPTIONS= GL "Enable GL support" off
PLIST_SUB+= MODULE_ARCH=freebsd${OSREL}-${ARCH}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if defined(WITH_GL) .if defined(WITH_GL)
CONFIGURE_ARGS+= --enable-gl-x11 CONFIGURE_ARGS+= --enable-gl-x11
PLIST_SUB+= WITH_GL="" PLIST_SUB+= WITH_GL=""
USE_GL= yes USE_GL= yes

View file

@ -1,11 +0,0 @@
--- configure.orig Thu Mar 16 14:51:32 2006
+++ configure Thu Mar 16 14:51:47 2006
@@ -20148,7 +20148,7 @@
fi
-MODULE_ARCH="$host_os-$host_cpu"
+MODULE_ARCH=""
cat >>confdefs.h <<_ACEOF

View file

@ -14,54 +14,54 @@ lib/libevas.a
lib/libevas.la lib/libevas.la
lib/libevas.so lib/libevas.so
lib/libevas.so.1 lib/libevas.so.1
lib/evas/modules/engines/buffer/module.a lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.a
lib/evas/modules/engines/buffer/module.la lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.la
lib/evas/modules/engines/buffer/module.so lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.so
%%WITH_GL%%lib/evas/modules/engines/gl_x11/module.a %%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.a
%%WITH_GL%%lib/evas/modules/engines/gl_x11/module.la %%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.la
%%WITH_GL%%lib/evas/modules/engines/gl_x11/module.so %%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.so
lib/evas/modules/engines/software_generic/module.a lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.a
lib/evas/modules/engines/software_generic/module.la lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.la
lib/evas/modules/engines/software_generic/module.so lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.so
lib/evas/modules/engines/software_x11/module.a lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.a
lib/evas/modules/engines/software_x11/module.la lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.la
lib/evas/modules/engines/software_x11/module.so lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.so
lib/evas/modules/engines/xrender_x11/module.a lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.a
lib/evas/modules/engines/xrender_x11/module.la lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.la
lib/evas/modules/engines/xrender_x11/module.so lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.so
lib/evas/modules/loaders/edb/module.a lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.a
lib/evas/modules/loaders/edb/module.la lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.la
lib/evas/modules/loaders/edb/module.so lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.so
lib/evas/modules/loaders/eet/module.a lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.a
lib/evas/modules/loaders/eet/module.la lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.la
lib/evas/modules/loaders/eet/module.so lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.so
lib/evas/modules/loaders/gif/module.a lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.a
lib/evas/modules/loaders/gif/module.la lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.la
lib/evas/modules/loaders/gif/module.so lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.so
lib/evas/modules/loaders/jpeg/module.a lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.a
lib/evas/modules/loaders/jpeg/module.la lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.la
lib/evas/modules/loaders/jpeg/module.so lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.so
lib/evas/modules/loaders/png/module.a lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.a
lib/evas/modules/loaders/png/module.la lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.la
lib/evas/modules/loaders/png/module.so lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.so
lib/evas/modules/loaders/tiff/module.a lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.a
lib/evas/modules/loaders/tiff/module.la lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.la
lib/evas/modules/loaders/tiff/module.so lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.so
lib/evas/modules/savers/edb/module.a lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.a
lib/evas/modules/savers/edb/module.la lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.la
lib/evas/modules/savers/edb/module.so lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.so
lib/evas/modules/savers/eet/module.a lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.a
lib/evas/modules/savers/eet/module.la lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.la
lib/evas/modules/savers/eet/module.so lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.so
lib/evas/modules/savers/jpeg/module.a lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.a
lib/evas/modules/savers/jpeg/module.la lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.la
lib/evas/modules/savers/jpeg/module.so lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.so
lib/evas/modules/savers/png/module.a lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.a
lib/evas/modules/savers/png/module.la lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.la
lib/evas/modules/savers/png/module.so lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.so
lib/evas/modules/savers/tiff/module.a lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.a
lib/evas/modules/savers/tiff/module.la lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.la
lib/evas/modules/savers/tiff/module.so lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.so
libdata/pkgconfig/evas.pc libdata/pkgconfig/evas.pc
%%DATADIR%%/Vera.ttf %%DATADIR%%/Vera.ttf
%%DATADIR%%/VeraBI.ttf %%DATADIR%%/VeraBI.ttf
@ -85,23 +85,39 @@ libdata/pkgconfig/evas.pc
%%DATADIR%%/t2.png %%DATADIR%%/t2.png
%%DATADIR%%/test_pattern.png %%DATADIR%%/test_pattern.png
@dirrm %%DATADIR%% @dirrm %%DATADIR%%
@dirrm lib/evas/modules/savers/tiff/%%MODULE_ARCH%%
@dirrm lib/evas/modules/savers/tiff @dirrm lib/evas/modules/savers/tiff
@dirrm lib/evas/modules/savers/png/%%MODULE_ARCH%%
@dirrm lib/evas/modules/savers/png @dirrm lib/evas/modules/savers/png
@dirrm lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%
@dirrm lib/evas/modules/savers/jpeg @dirrm lib/evas/modules/savers/jpeg
@dirrm lib/evas/modules/savers/eet/%%MODULE_ARCH%%
@dirrm lib/evas/modules/savers/eet @dirrm lib/evas/modules/savers/eet
@dirrm lib/evas/modules/savers/edb/%%MODULE_ARCH%%
@dirrm lib/evas/modules/savers/edb @dirrm lib/evas/modules/savers/edb
@dirrm lib/evas/modules/savers @dirrm lib/evas/modules/savers
@dirrm lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%
@dirrm lib/evas/modules/loaders/tiff @dirrm lib/evas/modules/loaders/tiff
@dirrm lib/evas/modules/loaders/png/%%MODULE_ARCH%%
@dirrm lib/evas/modules/loaders/png @dirrm lib/evas/modules/loaders/png
@dirrm lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%
@dirrm lib/evas/modules/loaders/jpeg @dirrm lib/evas/modules/loaders/jpeg
@dirrm lib/evas/modules/loaders/gif/%%MODULE_ARCH%%
@dirrm lib/evas/modules/loaders/gif @dirrm lib/evas/modules/loaders/gif
@dirrm lib/evas/modules/loaders/eet/%%MODULE_ARCH%%
@dirrm lib/evas/modules/loaders/eet @dirrm lib/evas/modules/loaders/eet
@dirrm lib/evas/modules/loaders/edb/%%MODULE_ARCH%%
@dirrm lib/evas/modules/loaders/edb @dirrm lib/evas/modules/loaders/edb
@dirrm lib/evas/modules/loaders @dirrm lib/evas/modules/loaders
@dirrm lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%
@dirrm lib/evas/modules/engines/xrender_x11 @dirrm lib/evas/modules/engines/xrender_x11
@dirrm lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%
@dirrm lib/evas/modules/engines/software_x11 @dirrm lib/evas/modules/engines/software_x11
@dirrm lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%
@dirrm lib/evas/modules/engines/software_generic @dirrm lib/evas/modules/engines/software_generic
%%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%
%%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11 %%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11
@dirrm lib/evas/modules/engines/buffer/%%MODULE_ARCH%%
@dirrm lib/evas/modules/engines/buffer @dirrm lib/evas/modules/engines/buffer
@dirrm lib/evas/modules/engines @dirrm lib/evas/modules/engines
@dirrm lib/evas/modules @dirrm lib/evas/modules

View file

@ -7,7 +7,7 @@
PORTNAME= enlightenment PORTNAME= enlightenment
PORTVERSION= 0.16.999.029 PORTVERSION= 0.16.999.029
PORTREVISION= 0 PORTREVISION= 1
CATEGORIES= x11-wm CATEGORIES= x11-wm
MASTER_SITES= http://enlightenment.freedesktop.org/files/ MASTER_SITES= http://enlightenment.freedesktop.org/files/
@ -26,11 +26,14 @@ USE_X_PREFIX= yes
USE_GNOME= gnomehack gnometarget USE_GNOME= gnomehack gnometarget
USE_ICONV= yes USE_ICONV= yes
USE_GETTEXT= yes USE_GETTEXT= yes
INSTALLS_SHLIB= yes
NO_LATEST_LINK= yes NO_LATEST_LINK= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
PLIST_SUB+= MODULE_ARCH=freebsd${OSREL}-${ARCH}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000 .if ${OSVERSION} < 500000

View file

@ -1,11 +0,0 @@
--- configure.orig Mon May 9 21:18:37 2005
+++ configure Mon May 9 21:18:49 2005
@@ -20125,7 +20125,7 @@
done
-MODULE_ARCH="$host_os-$host_cpu"
+MODULE_ARCH=""
cat >>confdefs.h <<_ACEOF

View file

@ -147,43 +147,43 @@ include/enlightenment/e_win.h
include/enlightenment/e_winlist.h include/enlightenment/e_winlist.h
include/enlightenment/e_xinerama.h include/enlightenment/e_xinerama.h
include/enlightenment/e_zone.h include/enlightenment/e_zone.h
lib/enlightenment/modules/battery/module.a lib/enlightenment/modules/battery/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/battery/module.eap lib/enlightenment/modules/battery/module.eap
lib/enlightenment/modules/battery/module.la lib/enlightenment/modules/battery/%%MODULE_ARCH%%/module.la
lib/enlightenment/modules/battery/module.so lib/enlightenment/modules/battery/%%MODULE_ARCH%%/module.so
lib/enlightenment/modules/clock/module.a lib/enlightenment/modules/clock/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/clock/module.eap lib/enlightenment/modules/clock/module.eap
lib/enlightenment/modules/clock/module.la lib/enlightenment/modules/clock/%%MODULE_ARCH%%/module.la
lib/enlightenment/modules/clock/module.so lib/enlightenment/modules/clock/%%MODULE_ARCH%%/module.so
lib/enlightenment/modules/cpufreq/freqset lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/freqset
lib/enlightenment/modules/cpufreq/module.a lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/cpufreq/module.eap lib/enlightenment/modules/cpufreq/module.eap
lib/enlightenment/modules/cpufreq/module.la lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/module.la
lib/enlightenment/modules/cpufreq/module.so lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/module.so
lib/enlightenment/modules/dropshadow/module.a lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/dropshadow/module.eap lib/enlightenment/modules/dropshadow/module.eap
lib/enlightenment/modules/dropshadow/module.la lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%/module.la
lib/enlightenment/modules/dropshadow/module.so lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%/module.so
lib/enlightenment/modules/ibar/module.a lib/enlightenment/modules/ibar/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/ibar/module.eap lib/enlightenment/modules/ibar/module.eap
lib/enlightenment/modules/ibar/module.la lib/enlightenment/modules/ibar/%%MODULE_ARCH%%/module.la
lib/enlightenment/modules/ibar/module.so lib/enlightenment/modules/ibar/%%MODULE_ARCH%%/module.so
lib/enlightenment/modules/ibox/module.a lib/enlightenment/modules/ibox/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/ibox/module.eap lib/enlightenment/modules/ibox/module.eap
lib/enlightenment/modules/ibox/module.la lib/enlightenment/modules/ibox/%%MODULE_ARCH%%/module.la
lib/enlightenment/modules/ibox/module.so lib/enlightenment/modules/ibox/%%MODULE_ARCH%%/module.so
lib/enlightenment/modules/pager/module.a lib/enlightenment/modules/pager/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/pager/module.eap lib/enlightenment/modules/pager/module.eap
lib/enlightenment/modules/pager/module.la lib/enlightenment/modules/pager/%%MODULE_ARCH%%/module.la
lib/enlightenment/modules/pager/module.so lib/enlightenment/modules/pager/%%MODULE_ARCH%%/module.so
lib/enlightenment/modules/start/module.a lib/enlightenment/modules/start/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/start/module.eap lib/enlightenment/modules/start/module.eap
lib/enlightenment/modules/start/module.la lib/enlightenment/modules/start/%%MODULE_ARCH%%/module.la
lib/enlightenment/modules/start/module.so lib/enlightenment/modules/start/%%MODULE_ARCH%%/module.so
lib/enlightenment/modules/temperature/module.a lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/temperature/module.eap lib/enlightenment/modules/temperature/module.eap
lib/enlightenment/modules/temperature/module.la lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.la
lib/enlightenment/modules/temperature/module.so lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.so
lib/enlightenment/preload/e_hack.a lib/enlightenment/preload/e_hack.a
lib/enlightenment/preload/e_hack.la lib/enlightenment/preload/e_hack.la
lib/enlightenment/preload/e_hack.so lib/enlightenment/preload/e_hack.so
@ -254,16 +254,25 @@ share/xsessions/enlightenment.desktop
@dirrm %%DATADIR%%/data/fonts @dirrm %%DATADIR%%/data/fonts
@dirrm %%DATADIR%%/data @dirrm %%DATADIR%%/data
@dirrm %%DATADIR%% @dirrm %%DATADIR%%
@dirrm share/xsessions @dirrmtry share/xsessions
@dirrm lib/enlightenment/preload @dirrm lib/enlightenment/preload
@dirrm lib/enlightenment/modules/temperature/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/temperature @dirrm lib/enlightenment/modules/temperature
@dirrm lib/enlightenment/modules/start/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/start @dirrm lib/enlightenment/modules/start
@dirrm lib/enlightenment/modules/pager/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/pager @dirrm lib/enlightenment/modules/pager
@dirrm lib/enlightenment/modules/ibox/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/ibox @dirrm lib/enlightenment/modules/ibox
@dirrm lib/enlightenment/modules/ibar/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/ibar @dirrm lib/enlightenment/modules/ibar
@dirrm lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/dropshadow @dirrm lib/enlightenment/modules/dropshadow
@dirrm lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/cpufreq @dirrm lib/enlightenment/modules/cpufreq
@dirrm lib/enlightenment/modules/clock/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/clock @dirrm lib/enlightenment/modules/clock
@dirrm lib/enlightenment/modules/battery/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/battery @dirrm lib/enlightenment/modules/battery
@dirrm lib/enlightenment/modules @dirrm lib/enlightenment/modules
@dirrm lib/enlightenment @dirrm lib/enlightenment