diff options
| -rw-r--r-- | x11-wm/e17-module-flame/Makefile | 3 | ||||
| -rw-r--r-- | x11-wm/e17-module-flame/files/patch-configure | 11 | ||||
| -rw-r--r-- | x11-wm/e17-module-flame/pkg-plist | 7 | ||||
| -rw-r--r-- | x11/e17-module-flame/Makefile | 3 | ||||
| -rw-r--r-- | x11/e17-module-flame/files/patch-configure | 11 | ||||
| -rw-r--r-- | x11/e17-module-flame/pkg-plist | 7 |
6 files changed, 14 insertions, 28 deletions
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile index d5f952610fc0..52927d0fd452 100644 --- a/x11-wm/e17-module-flame/Makefile +++ b/x11-wm/e17-module-flame/Makefile @@ -7,6 +7,7 @@ PORTNAME= flame PORTVERSION= 20060707 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://mbsd.msk.ru/dist/ PKGNAMEPREFIX= e17-module- @@ -25,6 +26,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +PLIST_SUB+= MODULE_ARCH=freebsd${OSREL}-${ARCH} + .if !defined(WITHOUT_NLS) USE_GETTEXT= yes PLIST_SUB+= NLS="" diff --git a/x11-wm/e17-module-flame/files/patch-configure b/x11-wm/e17-module-flame/files/patch-configure deleted file mode 100644 index bc913371e95e..000000000000 --- a/x11-wm/e17-module-flame/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Fri Jun 23 16:14:40 2006 -+++ configure Fri Jun 23 16:14:53 2006 -@@ -21497,7 +21497,7 @@ - - - --MODULE_ARCH="$host_os-$host_cpu" -+MODULE_ARCH="" - - - cat >>confdefs.h <<_ACEOF diff --git a/x11-wm/e17-module-flame/pkg-plist b/x11-wm/e17-module-flame/pkg-plist index a5044effd536..9ed88f7d9756 100644 --- a/x11-wm/e17-module-flame/pkg-plist +++ b/x11-wm/e17-module-flame/pkg-plist @@ -1,10 +1,11 @@ -lib/enlightenment/modules/flame/module.a +lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.a lib/enlightenment/modules/flame/module.eap -lib/enlightenment/modules/flame/module.la -lib/enlightenment/modules/flame/module.so +lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.la +lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.so lib/enlightenment/modules/flame/module_icon.png %%NLS%%share/locale/eo/LC_MESSAGES/flame.mo %%NLS%%share/locale/fi/LC_MESSAGES/flame.mo %%NLS%%share/locale/it/LC_MESSAGES/flame.mo %%NLS%%share/locale/ja/LC_MESSAGES/flame.mo +@dirrm lib/enlightenment/modules/flame/%%MODULE_ARCH%% @dirrm lib/enlightenment/modules/flame diff --git a/x11/e17-module-flame/Makefile b/x11/e17-module-flame/Makefile index d5f952610fc0..52927d0fd452 100644 --- a/x11/e17-module-flame/Makefile +++ b/x11/e17-module-flame/Makefile @@ -7,6 +7,7 @@ PORTNAME= flame PORTVERSION= 20060707 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://mbsd.msk.ru/dist/ PKGNAMEPREFIX= e17-module- @@ -25,6 +26,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +PLIST_SUB+= MODULE_ARCH=freebsd${OSREL}-${ARCH} + .if !defined(WITHOUT_NLS) USE_GETTEXT= yes PLIST_SUB+= NLS="" diff --git a/x11/e17-module-flame/files/patch-configure b/x11/e17-module-flame/files/patch-configure deleted file mode 100644 index bc913371e95e..000000000000 --- a/x11/e17-module-flame/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Fri Jun 23 16:14:40 2006 -+++ configure Fri Jun 23 16:14:53 2006 -@@ -21497,7 +21497,7 @@ - - - --MODULE_ARCH="$host_os-$host_cpu" -+MODULE_ARCH="" - - - cat >>confdefs.h <<_ACEOF diff --git a/x11/e17-module-flame/pkg-plist b/x11/e17-module-flame/pkg-plist index a5044effd536..9ed88f7d9756 100644 --- a/x11/e17-module-flame/pkg-plist +++ b/x11/e17-module-flame/pkg-plist @@ -1,10 +1,11 @@ -lib/enlightenment/modules/flame/module.a +lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.a lib/enlightenment/modules/flame/module.eap -lib/enlightenment/modules/flame/module.la -lib/enlightenment/modules/flame/module.so +lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.la +lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.so lib/enlightenment/modules/flame/module_icon.png %%NLS%%share/locale/eo/LC_MESSAGES/flame.mo %%NLS%%share/locale/fi/LC_MESSAGES/flame.mo %%NLS%%share/locale/it/LC_MESSAGES/flame.mo %%NLS%%share/locale/ja/LC_MESSAGES/flame.mo +@dirrm lib/enlightenment/modules/flame/%%MODULE_ARCH%% @dirrm lib/enlightenment/modules/flame |