diff options
| -rw-r--r-- | x11-wm/e17-module-deskshow/Makefile | 3 | ||||
| -rw-r--r-- | x11-wm/e17-module-deskshow/files/patch-configure | 11 | ||||
| -rw-r--r-- | x11-wm/e17-module-deskshow/pkg-plist | 7 | ||||
| -rw-r--r-- | x11/e17-module-deskshow/Makefile | 3 | ||||
| -rw-r--r-- | x11/e17-module-deskshow/files/patch-configure | 11 | ||||
| -rw-r--r-- | x11/e17-module-deskshow/pkg-plist | 7 |
6 files changed, 14 insertions, 28 deletions
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile index fea4c81f1c7a..c916051c2adf 100644 --- a/x11-wm/e17-module-deskshow/Makefile +++ b/x11-wm/e17-module-deskshow/Makefile @@ -7,6 +7,7 @@ PORTNAME= deskshow PORTVERSION= 20060707 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://mbsd.msk.ru/dist/ PKGNAMEPREFIX= e17-module- @@ -25,4 +26,6 @@ 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} + .include <bsd.port.mk> diff --git a/x11-wm/e17-module-deskshow/files/patch-configure b/x11-wm/e17-module-deskshow/files/patch-configure deleted file mode 100644 index bc913371e95e..000000000000 --- a/x11-wm/e17-module-deskshow/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-deskshow/pkg-plist b/x11-wm/e17-module-deskshow/pkg-plist index 1740d7473880..69ac90bece65 100644 --- a/x11-wm/e17-module-deskshow/pkg-plist +++ b/x11-wm/e17-module-deskshow/pkg-plist @@ -5,9 +5,10 @@ lib/enlightenment/modules/deskshow/e17_titlebar_glint2.png lib/enlightenment/modules/deskshow/e17_titlebar_glint3.png lib/enlightenment/modules/deskshow/e17_titlebar_shadow1.png lib/enlightenment/modules/deskshow/e17_titlebar_shadow2.png -lib/enlightenment/modules/deskshow/module.a +lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.a lib/enlightenment/modules/deskshow/module.eap -lib/enlightenment/modules/deskshow/module.la -lib/enlightenment/modules/deskshow/module.so +lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.la +lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.so lib/enlightenment/modules/deskshow/module_icon.png +@dirrm lib/enlightenment/modules/deskshow/%%MODULE_ARCH%% @dirrm lib/enlightenment/modules/deskshow diff --git a/x11/e17-module-deskshow/Makefile b/x11/e17-module-deskshow/Makefile index fea4c81f1c7a..c916051c2adf 100644 --- a/x11/e17-module-deskshow/Makefile +++ b/x11/e17-module-deskshow/Makefile @@ -7,6 +7,7 @@ PORTNAME= deskshow PORTVERSION= 20060707 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://mbsd.msk.ru/dist/ PKGNAMEPREFIX= e17-module- @@ -25,4 +26,6 @@ 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} + .include <bsd.port.mk> diff --git a/x11/e17-module-deskshow/files/patch-configure b/x11/e17-module-deskshow/files/patch-configure deleted file mode 100644 index bc913371e95e..000000000000 --- a/x11/e17-module-deskshow/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-deskshow/pkg-plist b/x11/e17-module-deskshow/pkg-plist index 1740d7473880..69ac90bece65 100644 --- a/x11/e17-module-deskshow/pkg-plist +++ b/x11/e17-module-deskshow/pkg-plist @@ -5,9 +5,10 @@ lib/enlightenment/modules/deskshow/e17_titlebar_glint2.png lib/enlightenment/modules/deskshow/e17_titlebar_glint3.png lib/enlightenment/modules/deskshow/e17_titlebar_shadow1.png lib/enlightenment/modules/deskshow/e17_titlebar_shadow2.png -lib/enlightenment/modules/deskshow/module.a +lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.a lib/enlightenment/modules/deskshow/module.eap -lib/enlightenment/modules/deskshow/module.la -lib/enlightenment/modules/deskshow/module.so +lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.la +lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.so lib/enlightenment/modules/deskshow/module_icon.png +@dirrm lib/enlightenment/modules/deskshow/%%MODULE_ARCH%% @dirrm lib/enlightenment/modules/deskshow |