diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2005-02-16 17:51:23 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2005-02-16 17:51:23 +0000 |
| commit | 3da3b5a45623923fbeb3e0e71e3a9ba3ba7bbfed (patch) | |
| tree | b8c7f75fa3467d1c90aa59f273274a82e31139dc /x11-toolkits/linux-f8-gtk | |
| parent | a3270771e8770c4f15cdbe90fd76929e62d16607 (diff) | |
| download | ports-3da3b5a45623923fbeb3e0e71e3a9ba3ba7bbfed.tar.gz ports-3da3b5a45623923fbeb3e0e71e3a9ba3ba7bbfed.zip | |
1. uses "ARCH" instead of "MACHINE_ARCH"
2. allow "ARCH" to be over-ridable.
3. fix ordering to better follow Mk/bsd.port.mk guidelines
XXX, I don't like setting "--ignorearch", but some ports just would not
install on amd64 w/o it. Even with the 'ARCH' override, installing these
RPM's would complain about the system being the wrong architecture.
Notes
Notes:
svn path=/head/; revision=129037
Diffstat (limited to 'x11-toolkits/linux-f8-gtk')
| -rw-r--r-- | x11-toolkits/linux-f8-gtk/Makefile | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile index 05a20c29f376..dcb95294c560 100644 --- a/x11-toolkits/linux-f8-gtk/Makefile +++ b/x11-toolkits/linux-f8-gtk/Makefile @@ -21,16 +21,23 @@ COMMENT?= RPM of the Gtk lib BUILD_DEPENDS+= rpm:${PORTSDIR}/archivers/rpm RUN_DEPENDS?= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs +ONLY_FOR_ARCHS?= i386 alpha amd64 + USE_LINUX_PREFIX= yes -USE_LINUX= yes -ONLY_FOR_ARCHS?= i386 alpha +.include <bsd.port.pre.mk> + +.if (${ARCH} == "amd64") +ARCH= i386 +RPMFLAGS+= --ignorearch +.endif +USE_LINUX= yes DIST_SUBDIR?= rpm EXTRACT_ONLY= NO_BUILD= yes NO_FILTER_SHLIBS= yes -PLIST?= ${PKGDIR}/pkg-plist.${MACHINE_ARCH} -MD5_FILE?= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST?= ${PKGDIR}/pkg-plist.${ARCH} +MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH} # Let's avoid hardcoding 'en' as the language. LANG= en @@ -39,15 +46,15 @@ BASEVERSION?= 7.1 RPM_MIRRORS= \ ftp://ftp.redhat.com/pub/redhat/__DIR__/ \ ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ -STDDIR= linux/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS -UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH} -.if (${MACHINE_ARCH} == "i386") -RPM_SET?= gtk+-1.2.9-4.${MACHINE_ARCH}.rpm -.elif (${MACHINE_ARCH} == "alpha") -RPM_SET?= gtk+-1.2.9-4.${MACHINE_ARCH}.rpm +STDDIR= linux/${BASEVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS +UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${ARCH} +.if (${ARCH} == "i386") +RPM_SET?= gtk+-1.2.9-4.${ARCH}.rpm +.elif (${ARCH} == "alpha") +RPM_SET?= gtk+-1.2.9-4.${ARCH}.rpm .endif DBPATH= /var/lib/rpm -RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ +RPMFLAGS+= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ --nodeps --replacepkgs RPMDIR= ${DISTDIR}/${DIST_SUBDIR} @@ -66,4 +73,4 @@ new-plist: ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' \ >> ${PLIST}.new -.include <bsd.port.mk> +.include <bsd.port.post.mk> |