aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoritetcu <itetcu@FreeBSD.org>2006-07-13 04:21:55 +0800
committeritetcu <itetcu@FreeBSD.org>2006-07-13 04:21:55 +0800
commit94e182c96785501e610e664cffe076404fea30e4 (patch)
tree50019062fa451d480af52325c4baa950b8d22006
parentbe58d35be7e9712f2de0c50bd5dbcb9f7b88097d (diff)
downloadfreebsd-ports-gnome-94e182c96785501e610e664cffe076404fea30e4.tar.gz
freebsd-ports-gnome-94e182c96785501e610e664cffe076404fea30e4.tar.zst
freebsd-ports-gnome-94e182c96785501e610e664cffe076404fea30e4.zip
In coordination with enlightenment-devel maintainer MODULE_ARCH was changed to
freebsd${OSREL}-${ARCH}. Appropriate patches for evas and enlightenment-devel have been commited. Track this. PR: ports/100119 Submited by: maintainer
-rw-r--r--x11-wm/e17-module-screenshot/Makefile3
-rw-r--r--x11-wm/e17-module-screenshot/files/patch-configure11
-rw-r--r--x11-wm/e17-module-screenshot/pkg-plist7
-rw-r--r--x11/e17-module-screenshot/Makefile3
-rw-r--r--x11/e17-module-screenshot/files/patch-configure11
-rw-r--r--x11/e17-module-screenshot/pkg-plist7
6 files changed, 14 insertions, 28 deletions
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index 06aaaf0fa41c..aaddd8aacd42 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= screenshot
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}
+
OPTIONS= IMAGIC "Use ImageMagick" on \
SCROT "Use Scrot" off
diff --git a/x11-wm/e17-module-screenshot/files/patch-configure b/x11-wm/e17-module-screenshot/files/patch-configure
deleted file mode 100644
index bc913371e95e..000000000000
--- a/x11-wm/e17-module-screenshot/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-screenshot/pkg-plist b/x11-wm/e17-module-screenshot/pkg-plist
index ce36c62f6c43..5cdca64316e5 100644
--- a/x11-wm/e17-module-screenshot/pkg-plist
+++ b/x11-wm/e17-module-screenshot/pkg-plist
@@ -2,10 +2,10 @@ lib/enlightenment/modules/screenshot/screenshot.edj
lib/enlightenment/modules/screenshot/e17_titlebar_glint1.png
lib/enlightenment/modules/screenshot/e17_titlebar_glint2.png
lib/enlightenment/modules/screenshot/e17_titlebar_glint3.png
-lib/enlightenment/modules/screenshot/module.a
+lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/screenshot/module.eap
-lib/enlightenment/modules/screenshot/module.la
-lib/enlightenment/modules/screenshot/module.so
+lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.la
+lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.so
lib/enlightenment/modules/screenshot/module_icon.png
%%NLS%%share/locale/eo/LC_MESSAGES/screenshot.mo
%%NLS%%share/locale/fi/LC_MESSAGES/screenshot.mo
@@ -14,4 +14,5 @@ lib/enlightenment/modules/screenshot/module_icon.png
%%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
%%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
%%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
+@dirrm lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/screenshot
diff --git a/x11/e17-module-screenshot/Makefile b/x11/e17-module-screenshot/Makefile
index 06aaaf0fa41c..aaddd8aacd42 100644
--- a/x11/e17-module-screenshot/Makefile
+++ b/x11/e17-module-screenshot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= screenshot
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}
+
OPTIONS= IMAGIC "Use ImageMagick" on \
SCROT "Use Scrot" off
diff --git a/x11/e17-module-screenshot/files/patch-configure b/x11/e17-module-screenshot/files/patch-configure
deleted file mode 100644
index bc913371e95e..000000000000
--- a/x11/e17-module-screenshot/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-screenshot/pkg-plist b/x11/e17-module-screenshot/pkg-plist
index ce36c62f6c43..5cdca64316e5 100644
--- a/x11/e17-module-screenshot/pkg-plist
+++ b/x11/e17-module-screenshot/pkg-plist
@@ -2,10 +2,10 @@ lib/enlightenment/modules/screenshot/screenshot.edj
lib/enlightenment/modules/screenshot/e17_titlebar_glint1.png
lib/enlightenment/modules/screenshot/e17_titlebar_glint2.png
lib/enlightenment/modules/screenshot/e17_titlebar_glint3.png
-lib/enlightenment/modules/screenshot/module.a
+lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.a
lib/enlightenment/modules/screenshot/module.eap
-lib/enlightenment/modules/screenshot/module.la
-lib/enlightenment/modules/screenshot/module.so
+lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.la
+lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.so
lib/enlightenment/modules/screenshot/module_icon.png
%%NLS%%share/locale/eo/LC_MESSAGES/screenshot.mo
%%NLS%%share/locale/fi/LC_MESSAGES/screenshot.mo
@@ -14,4 +14,5 @@ lib/enlightenment/modules/screenshot/module_icon.png
%%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
%%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
%%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
+@dirrm lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%
@dirrm lib/enlightenment/modules/screenshot